fix(TDI-41285): Error of compilation due to wrong split of SQL query

# Conflicts:
#	main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/utils/NodeUtil.java

i18n/features/org.talend.babel.all.tos.feature/pom.xml

@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.talend.studio</groupId>
-    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  
-  <artifactId>org.talend.babel.all.tos.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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.talend.studio</groupId>
+    <artifactId>tcommon-studio-se</artifactId>
+    <version>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  
+  <artifactId>org.talend.babel.all.tos.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

i18n/plugins/org.talend.common.ui.runtime.nl/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.talend.studio</groupId>
-    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.common.ui.runtime.nl</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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.talend.studio</groupId>
+    <artifactId>tcommon-studio-se</artifactId>
+    <version>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.common.ui.runtime.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

i18n/plugins/org.talend.commons.runtime.nl/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.talend.studio</groupId>
-    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.commons.runtime.nl</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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.talend.studio</groupId>
+    <artifactId>tcommon-studio-se</artifactId>
+    <version>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.commons.runtime.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

i18n/plugins/org.talend.commons.ui.nl/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.talend.studio</groupId>
-    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.commons.ui.nl</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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.talend.studio</groupId>
+    <artifactId>tcommon-studio-se</artifactId>
+    <version>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.commons.ui.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

i18n/plugins/org.talend.core.nl/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.talend.studio</groupId>
-    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.core.nl</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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.talend.studio</groupId>
+    <artifactId>tcommon-studio-se</artifactId>
+    <version>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.core.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

i18n/plugins/org.talend.core.repository.nl/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.talend.studio</groupId>
-    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.core.repository.nl</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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.talend.studio</groupId>
+    <artifactId>tcommon-studio-se</artifactId>
+    <version>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.core.repository.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

i18n/plugins/org.talend.core.runtime.nl/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.talend.studio</groupId>
-    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.core.runtime.nl</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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.talend.studio</groupId>
+    <artifactId>tcommon-studio-se</artifactId>
+    <version>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.core.runtime.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

i18n/plugins/org.talend.core.ui.nl/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.talend.studio</groupId>
-    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.core.ui.nl</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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.talend.studio</groupId>
+    <artifactId>tcommon-studio-se</artifactId>
+    <version>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.core.ui.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

i18n/plugins/org.talend.cwm.mip.edit.nl/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.talend.studio</groupId>
-    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.cwm.mip.edit.nl</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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.talend.studio</groupId>
+    <artifactId>tcommon-studio-se</artifactId>
+    <version>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.cwm.mip.edit.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

i18n/plugins/org.talend.cwm.mip.nl/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.talend.studio</groupId>
-    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.cwm.mip.nl</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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.talend.studio</groupId>
+    <artifactId>tcommon-studio-se</artifactId>
+    <version>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.cwm.mip.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

i18n/plugins/org.talend.designer.maven.ui.nl/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.talend.studio</groupId>
-    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.designer.maven.ui.nl</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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.talend.studio</groupId>
+    <artifactId>tcommon-studio-se</artifactId>
+    <version>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.designer.maven.ui.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

i18n/plugins/org.talend.help.nl/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.talend.studio</groupId>
-    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.help.nl</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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.talend.studio</groupId>
+    <artifactId>tcommon-studio-se</artifactId>
+    <version>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.help.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

i18n/plugins/org.talend.helpers.nl/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.talend.studio</groupId>
-    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.helpers.nl</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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.talend.studio</groupId>
+    <artifactId>tcommon-studio-se</artifactId>
+    <version>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.helpers.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

i18n/plugins/org.talend.librariesmanager.nl/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.talend.studio</groupId>
-    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.librariesmanager.nl</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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.talend.studio</groupId>
+    <artifactId>tcommon-studio-se</artifactId>
+    <version>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.librariesmanager.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

i18n/plugins/org.talend.librariesmanager.ui.nl/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.talend.studio</groupId>
-    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.librariesmanager.ui.nl</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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.talend.studio</groupId>
+    <artifactId>tcommon-studio-se</artifactId>
+    <version>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.librariesmanager.ui.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

i18n/plugins/org.talend.metadata.managment.nl/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.talend.studio</groupId>
-    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.metadata.managment.nl</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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.talend.studio</groupId>
+    <artifactId>tcommon-studio-se</artifactId>
+    <version>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.metadata.managment.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

i18n/plugins/org.talend.metadata.managment.ui.nl/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.talend.studio</groupId>
-    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.metadata.managment.ui.nl</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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.talend.studio</groupId>
+    <artifactId>tcommon-studio-se</artifactId>
+    <version>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.metadata.managment.ui.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

i18n/plugins/org.talend.migrationTool.nl/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.talend.studio</groupId>
-    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.migrationTool.nl</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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.talend.studio</groupId>
+    <artifactId>tcommon-studio-se</artifactId>
+    <version>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.migrationTool.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

i18n/plugins/org.talend.model.edit.nl/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.talend.studio</groupId>
-    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.model.edit.nl</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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.talend.studio</groupId>
+    <artifactId>tcommon-studio-se</artifactId>
+    <version>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.model.edit.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

i18n/plugins/org.talend.model.migration.nl/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.talend.studio</groupId>
-    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.model.migration.nl</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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.talend.studio</groupId>
+    <artifactId>tcommon-studio-se</artifactId>
+    <version>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.model.migration.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

i18n/plugins/org.talend.model.nl/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.talend.studio</groupId>
-    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.model.nl</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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.talend.studio</groupId>
+    <artifactId>tcommon-studio-se</artifactId>
+    <version>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.model.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

i18n/plugins/org.talend.presentation.onboarding.nl/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.talend.studio</groupId>
-    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.presentation.onboarding.nl</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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.talend.studio</groupId>
+    <artifactId>tcommon-studio-se</artifactId>
+    <version>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.presentation.onboarding.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

i18n/plugins/org.talend.rcp.nl/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.talend.studio</groupId>
-    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.rcp.nl</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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.talend.studio</groupId>
+    <artifactId>tcommon-studio-se</artifactId>
+    <version>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.rcp.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

i18n/plugins/org.talend.registration.nl/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.talend.studio</groupId>
-    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.registration.nl</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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.talend.studio</groupId>
+    <artifactId>tcommon-studio-se</artifactId>
+    <version>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.registration.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

i18n/plugins/org.talend.repository.items.importexport.nl/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.talend.studio</groupId>
-    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.repository.items.importexport.nl</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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.talend.studio</groupId>
+    <artifactId>tcommon-studio-se</artifactId>
+    <version>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.repository.items.importexport.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

i18n/plugins/org.talend.repository.items.importexport.ui.nl/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.talend.studio</groupId>
-    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.repository.items.importexport.ui.nl</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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.talend.studio</groupId>
+    <artifactId>tcommon-studio-se</artifactId>
+    <version>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.repository.items.importexport.ui.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

i18n/plugins/org.talend.repository.localprovider.nl/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.talend.studio</groupId>
-    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.repository.localprovider.nl</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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.talend.studio</groupId>
+    <artifactId>tcommon-studio-se</artifactId>
+    <version>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.repository.localprovider.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

i18n/plugins/org.talend.repository.mdm.nl/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.talend.studio</groupId>
-    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.repository.mdm.nl</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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.talend.studio</groupId>
+    <artifactId>tcommon-studio-se</artifactId>
+    <version>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.repository.mdm.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

i18n/plugins/org.talend.repository.metadata.nl/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.talend.studio</groupId>
-    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.repository.metadata.nl</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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.talend.studio</groupId>
+    <artifactId>tcommon-studio-se</artifactId>
+    <version>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.repository.metadata.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

i18n/plugins/org.talend.repository.view.nl/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.talend.studio</groupId>
-    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.repository.view.nl</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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.talend.studio</groupId>
+    <artifactId>tcommon-studio-se</artifactId>
+    <version>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.repository.view.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

i18n/plugins/org.talend.resources.nl/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.talend.studio</groupId>
-    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.resources.nl</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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.talend.studio</groupId>
+    <artifactId>tcommon-studio-se</artifactId>
+    <version>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.resources.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

main/features/org.talend.commons.feature/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.talend.studio</groupId>
-    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.commons.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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.talend.studio</groupId>
+    <artifactId>tcommon-studio-se</artifactId>
+    <version>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.commons.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

main/features/org.talend.core.feature/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.talend.studio</groupId>
-    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.core.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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.talend.studio</groupId>
+    <artifactId>tcommon-studio-se</artifactId>
+    <version>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.core.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

main/features/org.talend.fragment.jars.feature/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.talend.studio</groupId>
-    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.fragment.jars.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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.talend.studio</groupId>
+    <artifactId>tcommon-studio-se</artifactId>
+    <version>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.fragment.jars.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

main/features/org.talend.help.feature/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.talend.studio</groupId>
-    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.help.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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.talend.studio</groupId>
+    <artifactId>tcommon-studio-se</artifactId>
+    <version>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.help.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

main/features/org.talend.jdt.feature/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.talend.studio</groupId>
-    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.jdt.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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.talend.studio</groupId>
+    <artifactId>tcommon-studio-se</artifactId>
+    <version>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.jdt.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

main/features/org.talend.libraries.jdbc.feature/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.talend.studio</groupId>
-    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.libraries.jdbc.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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.talend.studio</groupId>
+    <artifactId>tcommon-studio-se</artifactId>
+    <version>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.libraries.jdbc.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

main/features/org.talend.m2e.feature/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.talend.studio</groupId>
-    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.m2e.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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.talend.studio</groupId>
+    <artifactId>tcommon-studio-se</artifactId>
+    <version>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.m2e.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

main/features/org.talend.model.migration.feature/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.talend.studio</groupId>
-    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.model.migration.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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.talend.studio</groupId>
+    <artifactId>tcommon-studio-se</artifactId>
+    <version>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.model.migration.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

main/features/org.talend.platform.feature/pom.xml

@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.talend.studio</groupId>
-    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  
-  <artifactId>org.talend.platform.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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.talend.studio</groupId>
+    <artifactId>tcommon-studio-se</artifactId>
+    <version>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  
+  <artifactId>org.talend.platform.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

main/features/org.talend.rcp.feature/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.talend.studio</groupId>
-    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.rcp.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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.talend.studio</groupId>
+    <artifactId>tcommon-studio-se</artifactId>
+    <version>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.rcp.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

main/features/org.talend.update.p2.feature/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.talend.studio</groupId>
-    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.update.p2.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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.talend.studio</groupId>
+    <artifactId>tcommon-studio-se</artifactId>
+    <version>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.update.p2.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

main/features/org.talend.updates.feature/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.talend.studio</groupId>
-    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.updates.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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.talend.studio</groupId>
+    <artifactId>tcommon-studio-se</artifactId>
+    <version>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.updates.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

main/features/org.talend.utils.feature/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.talend.studio</groupId>
-    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.utils.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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.talend.studio</groupId>
+    <artifactId>tcommon-studio-se</artifactId>
+    <version>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.utils.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

main/plugins/org.talend.common.ui.runtime/pom.xml

@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.talend.studio</groupId>
-    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.common.ui.runtime</artifactId>
-  <packaging>eclipse-plugin</packaging>
-  <build>
-	<plugins>
-	  <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-		<version>2.8.2</version>
-        <executions>
-          <execution>
-            <id>default-deploy</id>
-            <phase>deploy</phase>
-          </execution>
-        </executions>
-      </plugin>
-	</plugins>
-  </build>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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.talend.studio</groupId>
+    <artifactId>tcommon-studio-se</artifactId>
+    <version>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.common.ui.runtime</artifactId>
+  <packaging>eclipse-plugin</packaging>
+  <build>
+	<plugins>
+	  <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-deploy-plugin</artifactId>
+		<version>2.8.2</version>
+        <executions>
+          <execution>
+            <id>default-deploy</id>
+            <phase>deploy</phase>
+          </execution>
+        </executions>
+      </plugin>
+	</plugins>
+  </build>
+</project>

main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/swt/tableviewer/TableViewerCreatorNotModifiable.java

@@ -405,16 +405,15 @@ public class TableViewerCreatorNotModifiable<B> {
 
             @Override
             protected void handleDispose(DisposeEvent event) {
-                if(this.isCellEditorActive()){
+                if (this.isCellEditorActive()) {
                     CellEditor[] cellEditors = this.getCellEditors();
-                    for (int i = 0; i < cellEditors.length; i++) {
-                    CellEditor cellEditor = cellEditors[i];
-                    if (cellEditor != null && cellEditor.isActivated()
-                             && cellEditor instanceof IShowInvisibleCellEditorMethods) {
-                        ((IShowInvisibleCellEditorMethods)cellEditor).fireApplyEditorValue();
+                    for (CellEditor cellEditor : cellEditors) {
+                        if (cellEditor != null && cellEditor.isActivated()
+                                && cellEditor instanceof IShowInvisibleCellEditorMethods) {
+                            ((IShowInvisibleCellEditorMethods) cellEditor).fireApplyEditorValue();
+                        }
                     }
                 }
-              }
                 super.handleDispose(event);
             }
 
@@ -837,15 +836,17 @@ public class TableViewerCreatorNotModifiable<B> {
                 addTraverseListenerRecursivly(cellEditor.getControl(), traverseListenerForControls);
             }
         }
-        
-        getTable().addPaintListener(new PaintListener() {
+        if ((this.getTable().getStyle() & SWT.VIRTUAL) != 0) {
+            getTable().addPaintListener(new PaintListener() {
 
-            public void paintControl(PaintEvent event) {
-                if (tableEditorManager != null) {
-                    tableEditorManager.paintVisibleAreaEditor(event);
+                @Override
+                public void paintControl(PaintEvent event) {
+                    if (tableEditorManager != null) {
+                        tableEditorManager.paintVisibleAreaEditor(event);
+                    }
                 }
-            }           
-        });
+            });
+        }
     }
 
     /**

main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/swt/tableviewer/tableeditor/TableEditorManager.java

@@ -48,11 +48,11 @@ import org.talend.commons.utils.data.map.MultiLazyValuesMap;
 public class TableEditorManager {
 
     /**
-     * 
+     *
      * Event type. <br/>
-     * 
+     *
      * $Id: TableEditorManager.java 7183 2007-11-23 11:03:36Z amaumont $
-     * 
+     *
      */
     public enum EVENT_TYPE implements ITableEditorManagerEventType {
         CONTROL_CREATED,
@@ -105,7 +105,7 @@ public class TableEditorManager {
 
     /**
      * DOC amaumont TableEditorManager constructor comment.
-     * 
+     *
      * @param tableViewerCreator
      */
     public TableEditorManager(TableViewerCreatorNotModifiable tableViewerCreator) {
@@ -350,7 +350,7 @@ public class TableEditorManager {
         }
 
     }
-    
+
     public void paintVisibleAreaEditor(PaintEvent event) {
         Table table = tableViewerCreator.getTable();
         if (table.isDisposed()) {
@@ -373,10 +373,13 @@ public class TableEditorManager {
         // Set the cell editor if need
         for (int itemIndex = topIndex; itemIndex <= endIndex; itemIndex++) {
             TableItem item = table.getItem(itemIndex);
+            if (item.isDisposed()) {
+                continue;
+            }
             for (int columnIndex = 0; columnIndex < columnsWithEditorContent.size(); columnIndex++) {
                 TableViewerCreatorColumnNotModifiable column = columnsWithEditorContent.get(columnIndex);
                 TableEditorContentNotModifiable tableEditorContent = column.getTableEditorContent();
-                
+
                 if (dataToMultipleDataEditor.containsKey(item.getData())) {
                     Collection<TableEditor> tableEditorCollection = dataToMultipleDataEditor.getCollection(item.getData());
                     for (TableEditor tableEditor : tableEditorCollection) {
@@ -402,13 +405,13 @@ public class TableEditorManager {
         Table table = tableViewerCreator.getTable();
         if (table.isDisposed() || index >= table.getItems().length) {
             return;
-        }     
+        }
        int topIndex = table.getTopIndex();
        int itemCount = table.getItemCount();
-       int numVisibleLines = Math.min((table.getBounds().height / table.getItemHeight()) + 2, itemCount - topIndex); 
+        int numVisibleLines = Math.min((table.getBounds().height / table.getItemHeight()) + 2, itemCount - topIndex);
        if (index < topIndex || index > topIndex + numVisibleLines) {
            return;
-       }     
+        }
         for (int iEditorCol = 0; iEditorCol < columnsWithEditorContent.size(); iEditorCol++) {
             TableViewerCreatorColumnNotModifiable column = columnsWithEditorContent.get(iEditorCol);
 

main/plugins/org.talend.commons.runtime/pom.xml

@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.talend.studio</groupId>
-    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.commons.runtime</artifactId>
-  <packaging>eclipse-plugin</packaging>
-  <build>
-	<plugins>
-	  <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-		<version>2.8.2</version>
-        <executions>
-          <execution>
-            <id>default-deploy</id>
-            <phase>deploy</phase>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-compiler-plugin</artifactId>
-        <version>${tycho.version}</version>
-        <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
-        </configuration>
-      </plugin>
-	</plugins>
-  </build>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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.talend.studio</groupId>
+    <artifactId>tcommon-studio-se</artifactId>
+    <version>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.commons.runtime</artifactId>
+  <packaging>eclipse-plugin</packaging>
+  <build>
+	<plugins>
+	  <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-deploy-plugin</artifactId>
+		<version>2.8.2</version>
+        <executions>
+          <execution>
+            <id>default-deploy</id>
+            <phase>deploy</phase>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-compiler-plugin</artifactId>
+        <version>${tycho.version}</version>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+	</plugins>
+  </build>
+</project>

main/plugins/org.talend.commons.runtime/pom_server.xml

@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.talend</groupId>
         <artifactId>org.talend.tos</artifactId>
-        <version>6.3.1-SNAPSHOT</version>
+        <version>6.3.1</version>
         <relativePath>../pom_server.xml</relativePath>
     </parent>
 

main/plugins/org.talend.commons.ui/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.talend.studio</groupId>
-    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.commons.ui</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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.talend.studio</groupId>
+    <artifactId>tcommon-studio-se</artifactId>
+    <version>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.commons.ui</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/dialogs/ProgressDialog.java

@@ -18,7 +18,6 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.OperationCanceledException;
 import org.eclipse.jface.dialogs.ProgressMonitorDialog;
 import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
 import org.talend.commons.ui.runtime.thread.AsynchronousThreading;
@@ -98,22 +97,24 @@ public abstract class ProgressDialog {
                 display.asyncExec(new Runnable() {
 
                     public void run() {
-                        final ProgressMonitorDialog progressMonitorDialog = new ProgressMonitorDialog(parentShell);
+                        final ProgressMonitorDialog progressMonitorDialog = newProgressMonitorDialog(parentShell);
                         if (timeBeforeShowDialog > 0) {
-                            progressMonitorDialog.setOpenOnRun(false);
+                            if (progressMonitorDialog != null) {
+                                progressMonitorDialog.setOpenOnRun(false);
+                            }
                             // for bug 16801
                             AsynchronousThreading asynchronousThreading = new AsynchronousThreading(timeBeforeShowDialog, true,
                                     display, new Runnable() {
 
                                         public void run() {
-                                            progressMonitorDialog.open();
+                                            openDialog(progressMonitorDialog);
                                         }
                                     });
                             asynchronousThreading.start();
                         }
 
                         try {
-                            progressMonitorDialog.run(false, true, op);
+                            dialogRun(progressMonitorDialog, op);
                         } catch (InvocationTargetException e) {
                             // Pass it outside the workspace runnable
                             iteHolder[0] = e;
@@ -128,22 +129,24 @@ public abstract class ProgressDialog {
                 display.syncExec(new Runnable() {
 
                     public void run() {
-                        final ProgressMonitorDialog progressMonitorDialog = new ProgressMonitorDialog(parentShell);
+                        final ProgressMonitorDialog progressMonitorDialog = newProgressMonitorDialog(parentShell);
                         if (timeBeforeShowDialog > 0) {
-                            progressMonitorDialog.setOpenOnRun(false);
+                            if (progressMonitorDialog != null) {
+                                progressMonitorDialog.setOpenOnRun(false);
+                            }
                             // for bug 16801
                             AsynchronousThreading asynchronousThreading = new AsynchronousThreading(timeBeforeShowDialog, true,
                                     display, new Runnable() {
 
                                         public void run() {
-                                            progressMonitorDialog.open();
+                                            openDialog(progressMonitorDialog);
                                         }
                                     });
                             asynchronousThreading.start();
                         }
 
                         try {
-                            progressMonitorDialog.run(false, true, op);
+                            dialogRun(progressMonitorDialog, op);
                         } catch (InvocationTargetException e) {
                             // Pass it outside the workspace runnable
                             iteHolder[0] = e;
@@ -165,6 +168,19 @@ public abstract class ProgressDialog {
         }
     }
 
+    protected ProgressMonitorDialog newProgressMonitorDialog(Shell shell) {
+        return new ProgressMonitorDialog(shell);
+    }
+
+    protected void openDialog(ProgressMonitorDialog dialog) {
+        dialog.open();
+    }
+
+    protected void dialogRun(ProgressMonitorDialog dialog, IRunnableWithProgress op)
+            throws InvocationTargetException, InterruptedException {
+        dialog.run(false, true, op);
+    }
+
     public abstract void run(final IProgressMonitor monitor) throws InvocationTargetException, InterruptedException;
 
 }

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/utils/image/ImageCapture.java

@@ -27,6 +27,7 @@ import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Shell;
 import org.talend.commons.ui.runtime.image.ImageUtils;
+import org.talend.commons.utils.system.EnvironmentUtils;
 
 /**
  * <code>ImageCapture</code> provides utilities to capture images.
@@ -53,11 +54,7 @@ public class ImageCapture {
      * 
      * @param control
      */
-    public static Image capture(Control control) {
-
-        // First try not conclusive...
-        // So I should use org.eclipse.ve.internal.swt.targetvm.win32.ImageCapture class which work perfectly
-
+    public static Image capture(Control control) {    	
         Shell shell = control.getShell();
         Rectangle boundsShell = shell.getBounds();
 
@@ -71,7 +68,13 @@ public class ImageCapture {
         GC gc = new GC(control);
         Image image = new Image(control.getDisplay(), control.getSize().x, control.getSize().y);
 
-        gc.copyArea(image, 0, 0);
+        boolean skipCopyArea = false;
+    	if (EnvironmentUtils.isMacOsSytem()) {
+    		skipCopyArea = true;
+    	}
+    	if (!skipCopyArea) {
+    		gc.copyArea(image, 0, 0);
+    	}
         gc.dispose();
         return image;
         // return getImage(control, control.getSize().x, control.getSize().y, true);

main/plugins/org.talend.core.repository/pom.xml

@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.talend.studio</groupId>
-    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.core.repository</artifactId>
-  <packaging>eclipse-plugin</packaging>
-  <build>
-	<plugins>
-	  <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-		<version>2.8.2</version>
-        <executions>
-          <execution>
-            <id>default-deploy</id>
-            <phase>deploy</phase>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-compiler-plugin</artifactId>
-        <version>${tycho.version}</version>
-        <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
-        </configuration>
-      </plugin>
-	</plugins>
-  </build>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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.talend.studio</groupId>
+    <artifactId>tcommon-studio-se</artifactId>
+    <version>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.core.repository</artifactId>
+  <packaging>eclipse-plugin</packaging>
+  <build>
+	<plugins>
+	  <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-deploy-plugin</artifactId>
+		<version>2.8.2</version>
+        <executions>
+          <execution>
+            <id>default-deploy</id>
+            <phase>deploy</phase>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-compiler-plugin</artifactId>
+        <version>${tycho.version}</version>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+	</plugins>
+  </build>
+</project>

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/logintask/SyncLibrariesLoginTask.java

@@ -22,6 +22,11 @@ public class SyncLibrariesLoginTask extends AbstractLoginTask implements IRunnab
 
     private static ICoreService coreService = (ICoreService) GlobalServiceRegister.getDefault().getService(ICoreService.class);
 
+    @Override
+    public boolean isCommandlineTask() {
+        return true;
+    }
+
     @Override
     public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
         TimeMeasure.display = CommonsPlugin.isDebugMode();

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/model/AbstractEMFRepositoryFactory.java

@@ -71,6 +71,7 @@ import org.talend.designer.core.model.utils.emf.component.ComponentFactory;
 import org.talend.designer.core.model.utils.emf.component.IMPORTType;
 import org.talend.designer.core.model.utils.emf.talendfile.ElementParameterType;
 import org.talend.designer.core.model.utils.emf.talendfile.NodeType;
+import org.talend.designer.runprocess.IRunProcessService;
 import org.talend.repository.ProjectManager;
 import org.talend.repository.model.IProxyRepositoryFactory;
 import org.talend.repository.model.RepositoryConstants;
@@ -893,7 +894,7 @@ public abstract class AbstractEMFRepositoryFactory extends AbstractRepositoryFac
         getAllVersions(project, property, allVersion);
         for (IRepositoryViewObject repositoryObject : allVersion) {
             Property uptodateProperty = repositoryObject.getProperty();
-            if (uptodateProperty!=null&&uptodateProperty.getVersion().equals(property.getVersion())) {
+            if (uptodateProperty != null && uptodateProperty.getVersion().equals(property.getVersion())) {
                 return uptodateProperty;
             }
         }
@@ -1027,6 +1028,10 @@ public abstract class AbstractEMFRepositoryFactory extends AbstractRepositoryFac
      */
     @Override
     public void afterLogon() {
-        // do nothing by default
+        if (GlobalServiceRegister.getDefault().isServiceRegistered(IRunProcessService.class)) {
+            IRunProcessService service = (IRunProcessService) GlobalServiceRegister.getDefault().getService(
+                    IRunProcessService.class);
+            service.updateProjectPomWithTemplate();
+        }
     }
 }

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/model/ProjectRepositoryNode.java

@@ -486,8 +486,7 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
             return; // don't check the deleted item for ref-projects
         }
         for (ProjectReference refProject : (List<ProjectReference>) project.getReferencedProjects()) {
-            String parentBranch = ProjectManager.getInstance().getMainProjectBranch(project);
-            if (refProject.getBranch() == null || parentBranch.equals(refProject.getBranch())) {
+            if (ProjectManager.validReferenceProject(project, refProject)) {
                 Project p = refProject.getReferencedProject();
                 // no need caching
                 /*
@@ -1213,8 +1212,7 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
     private void handleReferenced(RepositoryNode parent) {
         if (parent.getType().equals(ENodeType.SYSTEM_FOLDER)) {
             for (ProjectReference refProject : (List<ProjectReference>) project.getEmfProject().getReferencedProjects()) {
-                String parentBranch = ProjectManager.getInstance().getMainProjectBranch(project);
-                if (refProject.getBranch() == null || refProject.getBranch().equals(parentBranch)) {
+                if (ProjectManager.validReferenceProject(project.getEmfProject(), refProject)) {
                     Project emfProject = refProject.getReferencedProject();
                     ProjectRepositoryNode referencedProjectNode = new ProjectRepositoryNode(
                             new org.talend.core.model.general.Project(emfProject), null, parent, this,

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/model/ProxyRepositoryFactory.java

@@ -58,12 +58,12 @@ import org.osgi.service.event.Event;
 import org.osgi.service.event.EventAdmin;
 import org.talend.commons.CommonsPlugin;
 import org.talend.commons.exception.BusinessException;
+import org.talend.commons.exception.ExceptionHandler;
 import org.talend.commons.exception.LoginException;
 import org.talend.commons.exception.PersistenceException;
 import org.talend.commons.exception.SystemException;
 import org.talend.commons.runtime.model.repository.ERepositoryStatus;
 import org.talend.commons.ui.runtime.CommonUIPlugin;
-import org.talend.commons.ui.runtime.exception.ExceptionHandler;
 import org.talend.commons.ui.runtime.exception.MessageBoxExceptionHandler;
 import org.talend.commons.utils.data.container.RootContainer;
 import org.talend.commons.utils.time.TimeMeasure;
@@ -1021,6 +1021,8 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
         return this.repositoryFactoryFromProvider.getAllVersion(project, id, avoidSaveProject);
     }
 
+
+    @Override
     public List<IRepositoryViewObject> getAllVersion(Project project, String id, String folderPath, ERepositoryObjectType type)
             throws PersistenceException {
         return this.repositoryFactoryFromProvider.getAllVersion(project, id, folderPath, type);
@@ -1847,7 +1849,9 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
 
                 currentMonitor = subMonitor.newChild(1, SubMonitor.SUPPRESS_NONE);
                 currentMonitor.beginTask(Messages.getString("ProxyRepositoryFactory.initializeProjectConnection"), 1); //$NON-NLS-1$
+                ProjectManager.getInstance().getBeforeLogonRecords().clear();
                 this.repositoryFactoryFromProvider.beforeLogon(project);
+                ProjectManager.getInstance().getBeforeLogonRecords().clear();
 
                 // monitorWrap.worked(1);
                 TimeMeasure.step("logOnProject", "beforeLogon"); //$NON-NLS-1$ //$NON-NLS-2$
@@ -1865,13 +1869,17 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
 
                 currentMonitor = subMonitor.newChild(1, SubMonitor.SUPPRESS_NONE);
                 currentMonitor.beginTask("Execute before logon migrations tasks", 1); //$NON-NLS-1$
+                ProjectManager.getInstance().getMigrationRecords().clear();
                 executeMigrations(project, true, currentMonitor);
+                ProjectManager.getInstance().getMigrationRecords().clear();
                 // monitorWrap.worked(1);
                 TimeMeasure.step("logOnProject", "executeMigrations(beforeLogonTasks)"); //$NON-NLS-1$ //$NON-NLS-2$
 
                 currentMonitor = subMonitor.newChild(1, SubMonitor.SUPPRESS_NONE);
                 currentMonitor.beginTask(Messages.getString("ProxyRepositoryFactory.logonInProgress"), 1); //$NON-NLS-1$
+                ProjectManager.getInstance().getLogonRecords().clear();
                 this.repositoryFactoryFromProvider.logOnProject(project);
+                ProjectManager.getInstance().getLogonRecords().clear();
                 // monitorWrap.worked(1);
                 TimeMeasure.step("logOnProject", "logOnProject"); //$NON-NLS-1$ //$NON-NLS-2$
 
@@ -1887,9 +1895,13 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                     coreUiService.componentsReset();
                 }
 
+                fireRepositoryPropertyChange(ERepositoryActionName.PROJECT_PREFERENCES_RELOAD.getName(), null, null);
+                
                 currentMonitor = subMonitor.newChild(1, SubMonitor.SUPPRESS_NONE);
                 currentMonitor.beginTask(Messages.getString("ProxyRepositoryFactory.exec.migration.tasks"), 1); //$NON-NLS-1$
+                ProjectManager.getInstance().getMigrationRecords().clear();
                 executeMigrations(project, false, currentMonitor);
+                ProjectManager.getInstance().getMigrationRecords().clear();
                 TimeMeasure.step("logOnProject", "executeMigrations(afterLogonTasks)"); //$NON-NLS-1$ //$NON-NLS-2$
                 if (monitor != null && monitor.isCanceled()) {
                     throw new OperationCanceledException(""); //$NON-NLS-1$
@@ -1898,8 +1910,20 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                 if (coreService != null) {
                     // clean workspace
                     currentMonitor.beginTask(Messages.getString("ProxyRepositoryFactory.cleanWorkspace"), 1); //$NON-NLS-1$
-                    coreService.deleteAllJobs(false);
+                    if (GlobalServiceRegister.getDefault().isServiceRegistered(IRunProcessService.class)) {
+                        IRunProcessService runProcessService = (IRunProcessService) GlobalServiceRegister.getDefault().getService(
+                                IRunProcessService.class);
+                        try {
+                            runProcessService.deleteAllJobs(false);
+                            runProcessService.getTalendProcessJavaProject().cleanMavenFiles(monitor);
+                            TimeMeasure.step("logOnProject", "clean Maven files"); //$NON-NLS-1$ //$NON-NLS-2$
+                        } catch (Exception e) {
+                            ExceptionHandler.process(e);
+                        }
+                    }
+
                     TimeMeasure.step("logOnProject", "clean Java project"); //$NON-NLS-1$ //$NON-NLS-2$
+
                     if (workspace instanceof Workspace) {
                         ((Workspace) workspace).getFileSystemManager().getHistoryStore().clean(currentMonitor);
                     }
@@ -1938,24 +1962,6 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                 }
                 TimeMeasure.step("logOnProject", "sync log4j"); //$NON-NLS-1$ //$NON-NLS-2$
 
-                if (CommonUIPlugin.isFullyHeadless()) {
-                    currentMonitor = subMonitor.newChild(1, SubMonitor.SUPPRESS_NONE);
-                    currentMonitor.beginTask(Messages.getString("ProxyRepositoryFactory.synchronizeLibraries"), 1); //$NON-NLS-1$
-                    coreService.syncLibraries(currentMonitor);
-                    TimeMeasure.step("logOnProject", "sync components libraries"); //$NON-NLS-1$ //$NON-NLS-2$
-                    if (monitor != null && monitor.isCanceled()) {
-                        throw new OperationCanceledException(""); //$NON-NLS-1$
-                    }
-                    coreService.createStatsLogAndImplicitParamter(project);
-                    if (monitor != null && monitor.isCanceled()) {
-                        throw new OperationCanceledException(""); //$NON-NLS-1$
-                    }
-                    coreService.synchronizeMapptingXML();
-
-                    if (monitor != null && monitor.isCanceled()) {
-                        throw new OperationCanceledException(""); //$NON-NLS-1$
-                    }
-                }
                 if (GlobalServiceRegister.getDefault().isServiceRegistered(ITDQRepositoryService.class)) {
                     ITDQRepositoryService tdqRepositoryService = (ITDQRepositoryService) GlobalServiceRegister.getDefault()
                             .getService(ITDQRepositoryService.class);

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/utils/StandaloneConnectionContextUtils.java

@@ -20,7 +20,9 @@ import org.eclipse.emf.common.util.BasicEList;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.common.util.EMap;
 import org.talend.core.database.EDatabaseTypeName;
+import org.talend.core.database.conn.ConnParameterKeys;
 import org.talend.core.database.conn.DatabaseConnStrUtil;
+import org.talend.core.database.conn.template.DbConnStrForHive;
 import org.talend.core.model.metadata.Dbms;
 import org.talend.core.model.metadata.IMetadataConnection;
 import org.talend.core.model.metadata.MetadataTalendType;
@@ -33,6 +35,7 @@ import org.talend.core.model.metadata.builder.connection.FileExcelConnection;
 import org.talend.core.model.metadata.builder.connection.HL7Connection;
 import org.talend.core.model.metadata.builder.connection.PositionalFileConnection;
 import org.talend.core.model.metadata.builder.connection.RegexpFileConnection;
+import org.talend.core.model.metadata.connection.hive.HiveServerVersionInfo;
 import org.talend.core.model.utils.CloneConnectionUtils;
 import org.talend.core.model.utils.ContextParameterUtils;
 import org.talend.core.utils.TalendQuoteUtils;
@@ -131,12 +134,233 @@ public class StandaloneConnectionContextUtils {
         // cloneConn.setContextId(dbConn.getContextId());
         // cloneConn.setContextMode(dbConn.isContextMode()); // if use context
 
+        // for hive :
+        if (EDatabaseTypeName.HIVE.equals(EDatabaseTypeName.getTypeFromDbType(dbConn.getDatabaseType()))) {
+            String hadoopUserName = cloneConn.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_USERNAME);
+            cloneConn.getParameters().put(ConnParameterKeys.CONN_PARA_KEY_USERNAME,
+                    getOriginalValue(contextProperties, hadoopUserName));
+            String jobTracker = cloneConn.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_JOB_TRACKER_URL);
+            cloneConn.getParameters().put(ConnParameterKeys.CONN_PARA_KEY_JOB_TRACKER_URL,
+                    getOriginalValue(contextProperties, jobTracker));
+            String nameNode = cloneConn.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_NAME_NODE_URL);
+            cloneConn.getParameters().put(ConnParameterKeys.CONN_PARA_KEY_NAME_NODE_URL,
+                    getOriginalValue(contextProperties, nameNode));
+            String hivePrincipal = cloneConn.getParameters().get(ConnParameterKeys.HIVE_AUTHENTICATION_HIVEPRINCIPLA);
+            cloneConn.getParameters().put(ConnParameterKeys.HIVE_AUTHENTICATION_HIVEPRINCIPLA,
+                    getOriginalValue(contextProperties, hivePrincipal));
+
+            String hiveMetadata = cloneConn.getParameters().get(ConnParameterKeys.HIVE_AUTHENTICATION_METASTOREURL);
+            cloneConn.getParameters().put(ConnParameterKeys.HIVE_AUTHENTICATION_METASTOREURL,
+                    getOriginalValue(contextProperties, hiveMetadata));
+
+            String driverPath = cloneConn.getParameters().get(ConnParameterKeys.HIVE_AUTHENTICATION_DRIVERJAR_PATH);
+            cloneConn.getParameters().put(ConnParameterKeys.HIVE_AUTHENTICATION_DRIVERJAR_PATH,
+                    getOriginalValue(contextProperties, driverPath));
+
+            String driverClass = cloneConn.getParameters().get(ConnParameterKeys.HIVE_AUTHENTICATION_DRIVERCLASS);
+            cloneConn.getParameters().put(ConnParameterKeys.HIVE_AUTHENTICATION_DRIVERCLASS,
+                    getOriginalValue(contextProperties, driverClass));
+
+            String hiveUserName = cloneConn.getParameters().get(ConnParameterKeys.HIVE_AUTHENTICATION_USERNAME);
+            cloneConn.getParameters().put(ConnParameterKeys.HIVE_AUTHENTICATION_USERNAME,
+                    getOriginalValue(contextProperties, hiveUserName));
+
+            String hivePassword = cloneConn.getParameters().get(ConnParameterKeys.HIVE_AUTHENTICATION_PASSWORD);
+            cloneConn.getParameters().put(ConnParameterKeys.HIVE_AUTHENTICATION_PASSWORD,
+                    getOriginalValue(contextProperties, hivePassword));
+
+            String ktPrincipal = cloneConn.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_KEYTAB_PRINCIPAL);
+            cloneConn.getParameters().put(ConnParameterKeys.CONN_PARA_KEY_KEYTAB_PRINCIPAL,
+                    getOriginalValue(contextProperties, ktPrincipal));
+
+            String keytab = cloneConn.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_KEYTAB);
+            cloneConn.getParameters().put(ConnParameterKeys.CONN_PARA_KEY_KEYTAB, getOriginalValue(contextProperties, keytab));
+
+            String maprticket_Username = cloneConn.getParameters().get(
+                    ConnParameterKeys.CONN_PARA_KEY_HIVE_AUTHENTICATION_USERNAME);
+            cloneConn.getParameters().put(ConnParameterKeys.CONN_PARA_KEY_HIVE_AUTHENTICATION_USERNAME,
+                    getOriginalValue(contextProperties, maprticket_Username));
+
+            String maprticket_Password = cloneConn.getParameters().get(
+                    ConnParameterKeys.CONN_PARA_KEY_HIVE_AUTHENTICATION_MAPRTICKET_PASSWORD);
+            cloneConn.getParameters().put(ConnParameterKeys.CONN_PARA_KEY_HIVE_AUTHENTICATION_MAPRTICKET_PASSWORD,
+                    getOriginalValue(contextProperties, maprticket_Password));
+
+            String maprticket_Cluster = cloneConn.getParameters().get(
+                    ConnParameterKeys.CONN_PARA_KEY_HIVE_AUTHENTICATION_MAPRTICKET_CLUSTER);
+            cloneConn.getParameters().put(ConnParameterKeys.CONN_PARA_KEY_HIVE_AUTHENTICATION_MAPRTICKET_CLUSTER,
+                    getOriginalValue(contextProperties, maprticket_Cluster));
+
+            String maprticket_Duration = cloneConn.getParameters().get(
+                    ConnParameterKeys.CONN_PARA_KEY_HIVE_AUTHENTICATION_MAPRTICKET_DURATION);
+            cloneConn.getParameters().put(ConnParameterKeys.CONN_PARA_KEY_HIVE_AUTHENTICATION_MAPRTICKET_DURATION,
+                    getOriginalValue(contextProperties, maprticket_Duration));
+
+            String jdbcPropertiesString = cloneConn.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_HIVE_JDBC_PROPERTIES);
+            cloneConn.getParameters().put(ConnParameterKeys.CONN_PARA_KEY_HIVE_JDBC_PROPERTIES,
+                    getOriginalValue(contextProperties, jdbcPropertiesString));
+
+            String additionalJDBCSettings = cloneConn.getParameters().get(
+                    ConnParameterKeys.CONN_PARA_KEY_HIVE_ADDITIONAL_JDBC_SETTINGS);
+            cloneConn.getParameters().put(ConnParameterKeys.CONN_PARA_KEY_HIVE_ADDITIONAL_JDBC_SETTINGS,
+                    getOriginalValue(contextProperties, additionalJDBCSettings));
+
+            String propertiesString = cloneConn.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_HIVE_PROPERTIES);
+            cloneConn.getParameters().put(ConnParameterKeys.CONN_PARA_KEY_HIVE_PROPERTIES,
+                    getOriginalValue(contextProperties, propertiesString));
+
+            String trustStorePath = cloneConn.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_SSL_TRUST_STORE_PATH);
+            if (trustStorePath != null) {
+                cloneConn.getParameters().put(ConnParameterKeys.CONN_PARA_KEY_SSL_TRUST_STORE_PATH,
+                        getOriginalValue(contextProperties, trustStorePath));
+            }
+
+            String trustStorePassword = cloneConn.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_SSL_TRUST_STORE_PASSWORD);
+            if (trustStorePassword != null) {
+                cloneConn.getParameters().put(
+                        ConnParameterKeys.CONN_PARA_KEY_SSL_TRUST_STORE_PASSWORD,
+                        cloneConn.getValue(cloneConn.getValue(getOriginalValue(contextProperties, trustStorePassword), false),
+                                true));
+            }
+
+            String template = null;
+            String hiveServerVersion = HiveServerVersionInfo.HIVE_SERVER_1.getKey();
+            EMap<String, String> parameterMap = dbConn.getParameters();
+            if (parameterMap != null) {
+                hiveServerVersion = parameterMap.get(ConnParameterKeys.HIVE_SERVER_VERSION);
+            }
+
+            if (HiveServerVersionInfo.HIVE_SERVER_2.getKey().equals(hiveServerVersion)) {
+                template = DbConnStrForHive.URL_HIVE_2_TEMPLATE;
+            } else {
+                template = DbConnStrForHive.URL_HIVE_1_TEMPLATE;
+            }
+            // the original value is a contexted value
+            String newURl = DatabaseConnStrUtil.getHiveURLString(cloneConn, server, port, sidOrDatabase, template);
+
+            cloneConn.setURL(newURl);
+            return cloneConn;
+        }
+
+        // for Hbase
+        if (EDatabaseTypeName.HBASE.equals(EDatabaseTypeName.getTypeFromDbType(cloneConn.getDatabaseType()))) {
+            String hbaseMasterPrin = cloneConn.getParameters().get(
+                    ConnParameterKeys.CONN_PARA_KEY_HBASE_AUTHENTICATION_MASTERPRINCIPAL);
+            cloneConn.getParameters().put(ConnParameterKeys.CONN_PARA_KEY_HBASE_AUTHENTICATION_MASTERPRINCIPAL,
+                    getOriginalValue(contextProperties, hbaseMasterPrin));
+
+            String hbaseRegionPrin = cloneConn.getParameters().get(
+                    ConnParameterKeys.CONN_PARA_KEY_HBASE_AUTHENTICATION_REGIONSERVERPRINCIPAL);
+            cloneConn.getParameters().put(ConnParameterKeys.CONN_PARA_KEY_HBASE_AUTHENTICATION_REGIONSERVERPRINCIPAL,
+                    getOriginalValue(contextProperties, hbaseRegionPrin));
+
+            String hbaseKeyTabPrin = cloneConn.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_KEYTAB_PRINCIPAL);
+            cloneConn.getParameters().put(ConnParameterKeys.CONN_PARA_KEY_KEYTAB_PRINCIPAL,
+                    getOriginalValue(contextProperties, hbaseKeyTabPrin));
+
+            String hbaseKeyTab = cloneConn.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_KEYTAB);
+            cloneConn.getParameters().put(ConnParameterKeys.CONN_PARA_KEY_KEYTAB,
+                    getOriginalValue(contextProperties, hbaseKeyTab));
+
+            String maprticket_Username = cloneConn.getParameters().get(
+                    ConnParameterKeys.CONN_PARA_KEY_HBASE_AUTHENTICATION_USERNAME);
+            cloneConn.getParameters().put(ConnParameterKeys.CONN_PARA_KEY_HBASE_AUTHENTICATION_USERNAME,
+                    getOriginalValue(contextProperties, maprticket_Username));
+
+            String maprticket_Password = cloneConn.getParameters().get(
+                    ConnParameterKeys.CONN_PARA_KEY_HBASE_AUTHENTICATION_MAPRTICKET_PASSWORD);
+            cloneConn.getParameters().put(ConnParameterKeys.CONN_PARA_KEY_HBASE_AUTHENTICATION_MAPRTICKET_PASSWORD,
+                    getOriginalValue(contextProperties, maprticket_Password));
+
+            String maprticket_Cluster = cloneConn.getParameters().get(
+                    ConnParameterKeys.CONN_PARA_KEY_HBASE_AUTHENTICATION_MAPRTICKET_CLUSTER);
+            cloneConn.getParameters().put(ConnParameterKeys.CONN_PARA_KEY_HBASE_AUTHENTICATION_MAPRTICKET_CLUSTER,
+                    getOriginalValue(contextProperties, maprticket_Cluster));
+
+            String maprticket_Duration = cloneConn.getParameters().get(
+                    ConnParameterKeys.CONN_PARA_KEY_HBASE_AUTHENTICATION_MAPRTICKET_DURATION);
+            cloneConn.getParameters().put(ConnParameterKeys.CONN_PARA_KEY_HBASE_AUTHENTICATION_MAPRTICKET_DURATION,
+                    getOriginalValue(contextProperties, maprticket_Duration));
+
+            String tableNSMapping = cloneConn.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_HBASE_TABLE_NS_MAPPING);
+            cloneConn.getParameters().put(ConnParameterKeys.CONN_PARA_KEY_HBASE_TABLE_NS_MAPPING,
+                    getOriginalValue(contextProperties, tableNSMapping));
+        }
+
+        // for Maprdb
+        if (EDatabaseTypeName.MAPRDB.equals(EDatabaseTypeName.getTypeFromDbType(cloneConn.getDatabaseType()))) {
+            String maprdbMasterPrin = cloneConn.getParameters().get(
+                    ConnParameterKeys.CONN_PARA_KEY_MAPRDB_AUTHENTICATION_MASTERPRINCIPAL);
+            cloneConn.getParameters().put(ConnParameterKeys.CONN_PARA_KEY_MAPRDB_AUTHENTICATION_MASTERPRINCIPAL,
+                    getOriginalValue(contextProperties, maprdbMasterPrin));
+
+            String maprdbRegionPrin = cloneConn.getParameters().get(
+                    ConnParameterKeys.CONN_PARA_KEY_MAPRDB_AUTHENTICATION_REGIONSERVERPRINCIPAL);
+            cloneConn.getParameters().put(ConnParameterKeys.CONN_PARA_KEY_MAPRDB_AUTHENTICATION_REGIONSERVERPRINCIPAL,
+                    getOriginalValue(contextProperties, maprdbRegionPrin));
+
+            String znodeParent = cloneConn.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_HBASE_ZNODE_PARENT);
+            cloneConn.getParameters().put(ConnParameterKeys.CONN_PARA_KEY_HBASE_ZNODE_PARENT,
+                    getOriginalValue(contextProperties, znodeParent));
+
+            String maprdbKeyTabPrin = cloneConn.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_KEYTAB_PRINCIPAL);
+            cloneConn.getParameters().put(ConnParameterKeys.CONN_PARA_KEY_KEYTAB_PRINCIPAL,
+                    getOriginalValue(contextProperties, maprdbKeyTabPrin));
+
+            String maprdbKeyTab = cloneConn.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_KEYTAB);
+            cloneConn.getParameters().put(ConnParameterKeys.CONN_PARA_KEY_KEYTAB,
+                    getOriginalValue(contextProperties, maprdbKeyTab));
+
+            String maprticket_Username = cloneConn.getParameters().get(
+                    ConnParameterKeys.CONN_PARA_KEY_MAPRDB_AUTHENTICATION_USERNAME);
+            cloneConn.getParameters().put(ConnParameterKeys.CONN_PARA_KEY_MAPRDB_AUTHENTICATION_USERNAME,
+                    getOriginalValue(contextProperties, maprticket_Username));
+
+            String maprticket_Password = cloneConn.getParameters().get(
+                    ConnParameterKeys.CONN_PARA_KEY_MAPRDB_AUTHENTICATION_MAPRTICKET_PASSWORD);
+            cloneConn.getParameters().put(ConnParameterKeys.CONN_PARA_KEY_MAPRDB_AUTHENTICATION_MAPRTICKET_PASSWORD,
+                    getOriginalValue(contextProperties, maprticket_Password));
+
+            String maprticket_Cluster = cloneConn.getParameters().get(
+                    ConnParameterKeys.CONN_PARA_KEY_MAPRDB_AUTHENTICATION_MAPRTICKET_CLUSTER);
+            cloneConn.getParameters().put(ConnParameterKeys.CONN_PARA_KEY_MAPRDB_AUTHENTICATION_MAPRTICKET_CLUSTER,
+                    getOriginalValue(contextProperties, maprticket_Cluster));
+
+            String maprticket_Duration = cloneConn.getParameters().get(
+                    ConnParameterKeys.CONN_PARA_KEY_MAPRDB_AUTHENTICATION_MAPRTICKET_DURATION);
+            cloneConn.getParameters().put(ConnParameterKeys.CONN_PARA_KEY_MAPRDB_AUTHENTICATION_MAPRTICKET_DURATION,
+                    getOriginalValue(contextProperties, maprticket_Duration));
+
+            String tableNSMapping = cloneConn.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_MAPRDB_TABLE_NS_MAPPING);
+            cloneConn.getParameters().put(ConnParameterKeys.CONN_PARA_KEY_MAPRDB_TABLE_NS_MAPPING,
+                    getOriginalValue(contextProperties, tableNSMapping));
+        }
+
+        // TDI-28124:tdb2input can't guess schema from join sql on system table
+        if (EDatabaseTypeName.IBMDB2.equals(EDatabaseTypeName.getTypeFromDbType(dbConn.getDatabaseType()))) {
+            String cursorForDb2 = ":cursorSensitivity=2;";
+            String database = sidOrDatabase + cursorForDb2;
+            String newURL = DatabaseConnStrUtil.getURLString(cloneConn.getDatabaseType(), dbConn.getDbVersionString(), server,
+                    username, password, port, database, filePath.toLowerCase(), datasource, dbRootPath, additionParam);
+            cloneConn.setURL(newURL);
+            return cloneConn;
+        }
+
+        if (EDatabaseTypeName.IMPALA.equals(EDatabaseTypeName.getTypeFromDbType(dbConn.getDatabaseType()))) {
+            String impalaAuthPrinciple = cloneConn.getParameters().get(ConnParameterKeys.IMPALA_AUTHENTICATION_PRINCIPLA);
+            if (impalaAuthPrinciple != null) {
+                cloneConn.getParameters().put(ConnParameterKeys.IMPALA_AUTHENTICATION_PRINCIPLA,
+                        getOriginalValue(contextProperties, impalaAuthPrinciple));
+            }
+        }
+
         // Added 20130311 TDQ-7000, when it is context mode and not general
         // jdbc, reset the url.
         if (dbConn.isContextMode()
                 && !EDatabaseTypeName.GENERAL_JDBC.equals(EDatabaseTypeName.getTypeFromDbType(dbConn.getDatabaseType()))) {
             String newURL = DatabaseConnStrUtil.getURLString(cloneConn.getDatabaseType(), dbConn.getDbVersionString(), server,
-                    username, password, port, sidOrDatabase, filePath.toLowerCase(), datasource, dbRootPath, additionParam);
+                    username, password, port, sidOrDatabase, filePath == null ? filePath : filePath.toLowerCase(), datasource,
+                    dbRootPath, additionParam);
             cloneConn.setURL(newURL);
             return cloneConn;
         }// ~

main/plugins/org.talend.core.runtime/pom.xml

@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.talend.studio</groupId>
-    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.core.runtime</artifactId>
-  <packaging>eclipse-plugin</packaging>
-  <build>
-	<plugins>
-	  <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-		<version>2.8.2</version>
-        <executions>
-          <execution>
-            <id>default-deploy</id>
-            <phase>deploy</phase>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-compiler-plugin</artifactId>
-        <version>${tycho.version}</version>
-        <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
-        </configuration>
-      </plugin>
-	</plugins>
-  </build>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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.talend.studio</groupId>
+    <artifactId>tcommon-studio-se</artifactId>
+    <version>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.core.runtime</artifactId>
+  <packaging>eclipse-plugin</packaging>
+  <build>
+	<plugins>
+	  <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-deploy-plugin</artifactId>
+		<version>2.8.2</version>
+        <executions>
+          <execution>
+            <id>default-deploy</id>
+            <phase>deploy</phase>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-compiler-plugin</artifactId>
+        <version>${tycho.version}</version>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+	</plugins>
+  </build>
+</project>

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/ILibraryManagerService.java

@@ -52,6 +52,8 @@ public interface ILibraryManagerService extends IService {
      */
     public void deploy(URI jarFileUri, IProgressMonitor... monitorWrap);
 
+    public void deploy(URI jarFileUri, String mavenUri, IProgressMonitor... monitorWrap);
+
     public void deploy(Collection<URI> jarFileUris, IProgressMonitor... monitorWrap);
 
     /**
@@ -97,6 +99,8 @@ public interface ILibraryManagerService extends IService {
             IProgressMonitor... monitorWrap);
 
     public boolean retrieve(ModuleNeeded module, String pathToStore, boolean showDialog, IProgressMonitor... monitorWrap);
+    
+    public boolean retrieve(ModuleNeeded module, String pathToStore, boolean showDialog, NexusServerBean bean, IProgressMonitor... monitorWrap);
 
     /**
      * 

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/ITDQSurvivorshipService.java

@@ -12,7 +12,11 @@
 // ============================================================================
 package org.talend.core;
 
+import java.util.Collection;
+
 import org.talend.core.model.process.INode;
+import org.talend.core.model.properties.Item;
+import org.talend.designer.core.model.utils.emf.talendfile.NodeType;
 
 /**
  * Interface of TDQSurvivorshipService
@@ -26,4 +30,13 @@ public interface ITDQSurvivorshipService extends IService {
      * @param node
      */
     public void createSurvivorshipItems(INode node);
+
+    /**
+     * 
+     * get all tRuleSurvirship Nodes from a job and all dependencies(job/joblet).
+     * 
+     * @param item
+     * @return
+     */
+    public Collection<NodeType> getSurvivorshipNodesOfProcess(Item item);
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/hadoop/repository/HadoopRepositoryUtil.java

@@ -184,7 +184,7 @@ public class HadoopRepositoryUtil {
         }
         ContextType contextType = null;
         if (mmUIService != null) {
-            contextType = mmUIService.getContextTypeForContextMode(connection);
+            contextType = mmUIService.getContextTypeForContextMode(connection, null, true);
         }
         if (useOriginalValue && contextType != null) {
             properties = getHadoopPropertiesWithOriginalValue(propertiesJsonStr, contextType, includeQuotes);

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/components/IComponent.java

@@ -57,6 +57,8 @@ public interface IComponent {
     String SPARK_STREAMING_JOBLET_FAMILY = "Spark Streaming Joblets"; //$NON-NLS-1$
 
     public String getName();
+    
+    public String getOriginalName();
 
     public String getLongName();
 

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/components/IComponentsFactory.java

@@ -78,6 +78,8 @@ public interface IComponentsFactory {
     public IComponent get(String name);
 
     public IComponent get(String name, String paletteType);
+    
+    public IComponent getJobletComponent(String name, String paletteType);
 
     public List<String> getSkeletons();
 

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/general/ILibrariesService.java

@@ -59,6 +59,10 @@ public interface ILibrariesService extends IService {
 
     public void deployLibrary(URL source) throws IOException;
 
+    public void deployLibrary(URL source, String mvnURI) throws IOException;
+
+    public void deployLibrary(URL source, String mavenUri, boolean refresh) throws IOException;
+
     public void deployLibrarys(URL[] source) throws IOException;
 
     public void undeployLibrary(String jarName) throws IOException;
@@ -100,7 +104,7 @@ public interface ILibrariesService extends IService {
     Set<ModuleNeeded> getCodesModuleNeededs(ERepositoryObjectType type);
 
     List<ModuleNeeded> getModuleNeeded(String id, boolean isGroup);
-    
+
     public void deployProjectLibrary(File source) throws IOException;
 
     /**

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/general/ModuleNeeded.java

@@ -401,7 +401,7 @@ public class ModuleNeeded {
 
     @Override
     public String toString() {
-        if (bundleName == null) {
+        if (bundleName == null || "".equals(bundleName.trim())) {
             return moduleName;
         } else if (bundleVersion == null) {
             return moduleName + "[" + bundleName + "]";

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/general/Project.java

@@ -330,5 +330,4 @@ public class Project {
     public void setExchangeUser(ExchangeUser exchangeUser) {
         // project.setExchangeUser(exchangeUser);
     }
-
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/builder/ConvertionHelper.java

@@ -49,6 +49,7 @@ import org.talend.cwm.helper.ConnectionHelper;
 import org.talend.cwm.helper.SAPBWTableHelper;
 import org.talend.cwm.helper.TaggedValueHelper;
 import org.talend.model.bridge.ReponsitoryContextBridge;
+import org.talend.repository.model.IProxyRepositoryFactory;
 
 import orgomg.cwm.objectmodel.core.TaggedValue;
 
@@ -340,6 +341,10 @@ public final class ConvertionHelper {
     public static IMetadataTable convert(MetadataTable old) {
         IMetadataTable result = new org.talend.core.model.metadata.MetadataTable();
         result.setComment(old.getComment());
+        if(old.getId() == null){
+            IProxyRepositoryFactory factory = CoreRuntimePlugin.getInstance().getProxyRepositoryFactory();
+            old.setId(factory.getNextId());
+        }
         result.setId(old.getId());
         result.setLabel(old.getLabel());
         result.setTableType(old.getTableType());

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/designerproperties/RepositoryToComponentProperty.java

@@ -990,7 +990,8 @@ public class RepositoryToComponentProperty {
                         || EDatabaseConnTemplate.ORACLESN.getDBDisplayName().equals(databaseType)
                         || EDatabaseConnTemplate.PLUSPSQL.getDBDisplayName().equals(databaseType)
                         || EDatabaseConnTemplate.PSQL.getDBDisplayName().equals(databaseType)
-                        || EDatabaseConnTemplate.SAPHana.getDBDisplayName().equals(databaseType)) {
+                        || EDatabaseConnTemplate.SAPHana.getDBDisplayName().equals(databaseType)
+                        || EDatabaseConnTemplate.MSSQL.getDBDisplayName().equals(databaseType)) {
                     if (dbVersionString != null) {
                         driverValue = dbVersionString.toUpperCase();
                     }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/process/ElementParameterParser.java

@@ -174,9 +174,10 @@ public final class ElementParameterParser {
             return null;
         } else {
             String linkedNodeName = ElementParameterParser.getValue(node, parameterName);
-            java.util.List<? extends INode> allGraphicNodes = ((INode) node).getProcess().getGraphicalNodes();
-            if (allGraphicNodes != null && allGraphicNodes.size() > 0) {
-                for (INode linkedNode : allGraphicNodes) {
+            //when linked node in joblet, can be found in generating node list only
+            java.util.List<? extends INode> allGeneratingNodes = ((INode) node).getProcess().getGeneratingNodes();
+            if (allGeneratingNodes != null && allGeneratingNodes.size() > 0) {
+                for (INode linkedNode : allGeneratingNodes) {
                     if (linkedNode.getUniqueName().equals(linkedNodeName)) {
                         return linkedNode;
                     }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/relationship/RelationshipItemBuilder.java

@@ -648,14 +648,25 @@ public class RelationshipItemBuilder {
 
         if (item instanceof ProcessItem) {
             type = JOB_RELATION;
-        }
-        if (item instanceof JobletProcessItem) {
+        } else if (item instanceof JobletProcessItem) {
             type = JOBLET_RELATION;
+        } else {
+            throw new RuntimeException(Messages.getString("RelationshipItemBuilder.unexpect.item", item.getClass().getName())); //$NON-NLS-1$
         }
 
         return type;
     }
 
+    public List<ERepositoryObjectType> getSupportRepObjTypes(String relationType) {
+        if (JOB_RELATION.equals(relationType)) {
+            return ERepositoryObjectType.getAllTypesOfProcess();
+        } else if (JOBLET_RELATION.equals(relationType)) {
+            return ERepositoryObjectType.getAllTypesOfJoblet();
+        } else {
+            throw new RuntimeException(Messages.getString("RelationshipItemBuilder.unexpect.relation", relationType)); //$NON-NLS-1$
+        }
+    }
+
     private void clearItemsRelations(Item baseItem) {
         Relation relation = new Relation();
         relation.setId(baseItem.getProperty().getId());
@@ -840,18 +851,32 @@ public class RelationshipItemBuilder {
     
     public boolean supportRelation(Item item){
         ERepositoryObjectType itemType = ERepositoryObjectType.getItemType(item);
-        if (ERepositoryObjectType.getAllTypesOfProcess().contains(itemType)) {
-            return true;
-        }else if(ERepositoryObjectType.JOBLET!=null && itemType == ERepositoryObjectType.JOBLET){
-            return true;
-        }else if(ERepositoryObjectType.SPARK_JOBLET!=null && itemType == ERepositoryObjectType.SPARK_JOBLET){
-            return true;
-        }else if(ERepositoryObjectType.SPARK_STREAMING_JOBLET!=null && itemType == ERepositoryObjectType.SPARK_STREAMING_JOBLET){
+
+        List<ERepositoryObjectType> supportTypes = getSupportTypes();
+
+        if (supportTypes != null && supportTypes.contains(itemType)) {
             return true;
         }
+
         return false;
     }
 
+    public List<ERepositoryObjectType> getSupportTypes() {
+        List<ERepositoryObjectType> supportTypes = new ArrayList<ERepositoryObjectType>();
+
+        List<ERepositoryObjectType> processTypes = getSupportRepObjTypes(JOB_RELATION);
+        if (processTypes != null && !processTypes.isEmpty()) {
+            supportTypes.addAll(processTypes);
+        }
+
+        List<ERepositoryObjectType> jobletTypes = getSupportRepObjTypes(JOBLET_RELATION);
+        if (jobletTypes != null && !jobletTypes.isEmpty()) {
+            supportTypes.addAll(jobletTypes);
+        }
+
+        return supportTypes;
+    }
+
     public void addOrUpdateItem(Item item) {
         addOrUpdateItem(item, false);
     }
@@ -944,6 +969,17 @@ public class RelationshipItemBuilder {
         }
     }
 
+    public void removeItemRelations(Relation relation, boolean save) {
+        Map<Relation, Set<Relation>> itemRelations = getCurrentProjectItemsRelations();
+        if (itemRelations != null && itemRelations.containsKey(relation)) {
+            itemRelations.get(relation).clear();
+            itemRelations.remove(relation);
+            if (save) {
+                saveRelations();
+            }
+        }
+    }
+
     public Map<Relation, Set<Relation>> getCurrentProjectItemsRelations() {
         return this.currentProjectItemsRelations;
     }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/repository/IRepositoryPrefConstants.java

@@ -51,4 +51,5 @@ public interface IRepositoryPrefConstants {
 
     public static final String ALLOW_SPECIFIC_CHARACTERS_FOR_SCHEMA_COLUMNS = "allow_specific_characters_for_schema_columns";
 
+    public static final String REF_PROJECT_BRANCH_SETTING = "ref_project_branch_setting";
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/utils/NodeUtil.java

@@ -12,6 +12,7 @@
 // ============================================================================
 package org.talend.core.model.utils;
 
+import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -23,6 +24,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import org.talend.core.model.components.ComponentCategory;
 import org.talend.core.model.components.IComponent;
@@ -930,18 +933,40 @@ public class NodeUtil {
         return value;
     }
 
+    public static String replaceCRLFInMEMO_SQL(String original) {
+        return replaceCRLFInMEMO_SQL(original, true);
+    }
+    
     /**
      *
      * DOC liuwu Comment method "replaceMEMO_SQL". aim: to resolve TDI-7487
-     *
+     * 
+     * if splitAlways is true, will split the string always to avoid the huge string constant
+     * if splitAlways is false, split only when the string constant reach the limit : 60000 bytes
+     * 
      * @param original
      * @return
      */
-    public static String replaceCRLFInMEMO_SQL(String original) {
+    public static String replaceCRLFInMEMO_SQL(String original, boolean splitAlways) {
         if (original == null || original.trim().length() == 0) {
             return original;
         }
-        String result = "";
+        StringBuilder result = new StringBuilder();
+        
+        boolean needSplit = true;
+        
+        if(!splitAlways) {
+            try {
+                //there is 64k limit for string constant, we set the limit to 60000 for code format reason like auto new line for editor
+                needSplit = original.getBytes("UTF-8").length > 60000;
+            } catch (UnsupportedEncodingException e) {
+            }
+        }
+        
+        Pattern invalid_unicode_character_regex = Pattern.compile("^.*(\\\\u[0-9a-fA-F]{0,3})$", Pattern.DOTALL);
+        //now don't process the octal case for code performance, can enable it when real need from customer
+        //Pattern invalid_octal_character_regex = Pattern.compile("^.*(\\\\[0-9]{1,2})$", Pattern.DOTALL);
+        
         int leftQuotes = original.indexOf("\"");
         int rightQuotes = original.indexOf("\"", leftQuotes + 1);
         int fakeRightQuotes = original.indexOf("\\\"", leftQuotes + 1);
@@ -950,14 +975,52 @@ public class NodeUtil {
             fakeRightQuotes = original.indexOf("\\\"", fakeRightQuotes + 1);
         }
         int leftPrev = 0;
-        while (leftQuotes >= 0 && rightQuotes > leftQuotes) {
-            if (leftQuotes > leftPrev) {
-                result += original.substring(leftPrev, leftQuotes);
-            }
-            // System.out.println("leftQuote="+leftQuotes + ", rightQuote="+rightQuotes);
-            if (leftQuotes < rightQuotes) {
-                result += original.substring(leftQuotes, rightQuotes + 1).replace("\r", "").replace("\n", "\\n");
-            }
+    		while (leftQuotes >= 0 && rightQuotes > leftQuotes) {
+      			if (leftQuotes > leftPrev) {//Outside of double quote
+      				  result.append(original.substring(leftPrev, leftQuotes));
+      			}
+      			
+      			if (leftQuotes < rightQuotes) {//Inside of double quote
+        				//split string for better appearance and avoid compile error when string exceed 64k
+        			  if(needSplit) {
+            				int current = leftQuotes;
+            				int Offset = 120;
+            				int count = 0;
+            				while (rightQuotes + 1 - current > 120) {
+            				    //[\u0000] or [\000]
+            				    Matcher matcher = invalid_unicode_character_regex.matcher(original.substring(current, current + Offset));
+              				  if(matcher.matches()) {
+              				      Offset = Offset - matcher.group(1).length();
+              				  } 
+              				  /*
+              				  else {
+                  				  matcher = invalid_octal_character_regex.matcher(original.substring(current, current + Offset));
+                            if(matcher.matches()) {
+                                Offset = Offset - matcher.group(1).length();
+                            }
+              				  }
+              				  */
+            				  
+              					while (original.charAt(current + Offset - 1) == '\\') {//avoid split special character e.g. \"
+              						  Offset--;
+              					}
+              					
+              					if(count>500){//This is the code that really solve TDI-39968 others are only for good appearance.
+                						result.append(original.substring(current, current + Offset).replace("\r", "").replace("\n", "\\n")).append("\" + new String()\n+\"");
+                						count = 0;
+              					}else{
+              						  result.append(original.substring(current, current + Offset).replace("\r", "").replace("\n", "\\n")).append("\"\n+\"");
+              					}
+              					
+              					current += Offset;
+              					Offset = 120;
+              					count++;
+            				}
+            				result.append(original.substring(current, rightQuotes + 1).replace("\r", "").replace("\n", "\\n"));
+        			  } else {
+            				result.append(original.substring(leftQuotes, rightQuotes + 1).replace("\r", "").replace("\n", "\\n"));
+        			  }
+      			}
 
             leftQuotes = original.indexOf("\"", rightQuotes + 1);
             leftPrev = rightQuotes + 1;
@@ -968,8 +1031,8 @@ public class NodeUtil {
                 fakeRightQuotes = original.indexOf("\\\"", fakeRightQuotes + 1);
             }
         }
-        result += original.substring(leftPrev);
-        return result;
+        result.append(original.substring(leftPrev));
+        return result.toString();
     }
 
     /**

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/nexus/TalendLibsServerManager.java

@@ -204,6 +204,11 @@ public class TalendLibsServerManager {
         return mavenResolver;
 
     }
+    
+    public void checkAndUpdateNexusServer() {
+       lastConnectionValid = null;
+       getCustomNexusServer();
+    }
 
     public NexusServerBean getCustomNexusServer() {
         if (!org.talend.core.PluginChecker.isCoreTISPluginLoaded()) {
@@ -223,32 +228,40 @@ public class TalendLibsServerManager {
                     || Boolean.FALSE == lastConnectionValid) {
                 return null;
             }
-            if (repositoryContext != null && repositoryContext.getFields() != null && !factory.isLocalConnectionProvider()
-                    && !repositoryContext.isOffline()) {
-                String adminUrl = repositoryContext.getFields().get(RepositoryConstants.REPOSITORY_URL);
-                String userName = "";
-                String password = "";
-                User user = repositoryContext.getUser();
-                if (user != null) {
-                    userName = user.getLogin();
-                    password = repositoryContext.getClearPassword();
-                }
+            if (lastConnectionValid != Boolean.TRUE) {
+                if (repositoryContext != null && repositoryContext.getFields() != null && !factory.isLocalConnectionProvider()
+                        && !repositoryContext.isOffline()) {
+                    String adminUrl = repositoryContext.getFields().get(RepositoryConstants.REPOSITORY_URL);
+                    String userName = "";
+                    String password = "";
+                    User user = repositoryContext.getUser();
+                    if (user != null) {
+                        userName = user.getLogin();
+                        password = repositoryContext.getClearPassword();
+                    }
 
-                if (adminUrl != null && !"".equals(adminUrl)
-                        && GlobalServiceRegister.getDefault().isServiceRegistered(IRemoteService.class)) {
-                    IRemoteService remoteService = (IRemoteService) GlobalServiceRegister.getDefault().getService(
-                            IRemoteService.class);
-                    JSONObject libServerObject;
-                    libServerObject = remoteService.getLibNexusServer(userName, password, adminUrl);
-                    if (libServerObject != null) {
-                        nexus_url = libServerObject.getString(KEY_NEXUS_RUL);
-                        nexus_user = libServerObject.getString(KEY_NEXUS_USER);
-                        nexus_pass = libServerObject.getString(KEY_NEXUS_PASS);
-                        repositoryId = libServerObject.getString(KEY_CUSTOM_LIB_REPOSITORY);
-                        snapshotRepId = libServerObject.getString(KEY_CUSTOM_LIB_SNAPSHOT_REPOSITORY);
+                    if (adminUrl != null && !"".equals(adminUrl)
+                            && GlobalServiceRegister.getDefault().isServiceRegistered(IRemoteService.class)) {
+                        IRemoteService remoteService = (IRemoteService) GlobalServiceRegister.getDefault().getService(
+                                IRemoteService.class);
+                        JSONObject libServerObject;
+                        libServerObject = remoteService.getLibNexusServer(userName, password, adminUrl);
+                        if (libServerObject != null) {
+                            nexus_url = libServerObject.getString(KEY_NEXUS_RUL);
+                            nexus_user = libServerObject.getString(KEY_NEXUS_USER);
+                            nexus_pass = libServerObject.getString(KEY_NEXUS_PASS);
+                            repositoryId = libServerObject.getString(KEY_CUSTOM_LIB_REPOSITORY);
+                            snapshotRepId = libServerObject.getString(KEY_CUSTOM_LIB_SNAPSHOT_REPOSITORY);
+                            System.setProperty(NEXUS_URL, nexus_url);
+                            System.setProperty(NEXUS_USER, nexus_user);
+                            System.setProperty(NEXUS_PASSWORD, nexus_pass);
+                            System.setProperty(NEXUS_LIB_REPO, repositoryId);
+                            System.setProperty(NEXUS_LIB_SNAPSHOT_REPO, snapshotRepId);
+                        }
                     }
                 }
             }
+            
             if (lastConnectionValid == null) {
                 boolean connectionOk = NexusServerUtils.checkConnectionStatus(nexus_url, repositoryId, nexus_user, nexus_pass)
                         && NexusServerUtils.checkConnectionStatus(nexus_url, snapshotRepId, nexus_user, nexus_pass);

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/prefs/ITalendCorePrefConstants.java

@@ -82,9 +82,11 @@ public interface ITalendCorePrefConstants {
     public static final String DEACTIVE_REPOSITORY_UPDATE = "DEACTIVE_REPOSITORY_UPDATE"; //$NON-NLS-1$
 
     public static final String DB_CONNECTION_TIMEOUT_ACTIVED = "db_conn_timeout_actived"; //$NON-NLS-1$
-
+    
     public static final String DB_CONNECTION_TIMEOUT = "db_conn_timeout"; //$NON-NLS-1$
 
+    public static final String HBASE_OR_MAPRDB_SCAN_LIMIT = "hbase_or_maprdb_scan_limit"; //$NON-NLS-1$
+
     public static final String DOC_USER_LOGO = "doc_user_logo"; //$NON-NLS-1$
 
     public static final String DOC_COMPANY_NAME = "company_name"; //$NON-NLS-1$

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/prefs/PreferenceManipulator.java

@@ -24,6 +24,7 @@ import org.eclipse.ui.PlatformUI;
 import org.talend.commons.exception.ExceptionHandler;
 import org.talend.commons.utils.Hex;
 import org.talend.core.model.general.ConnectionBean;
+import org.talend.core.model.repository.IRepositoryPrefConstants;
 import org.talend.utils.json.JSONArray;
 import org.talend.utils.json.JSONException;
 import org.talend.utils.json.JSONObject;
@@ -335,5 +336,25 @@ public final class PreferenceManipulator implements ITalendCorePrefConstants {
         store.setValue(hexKey, json.toString());
         save();
     }
+    
+    public void setAllLocalRefBranchSetting(JSONObject allBranchSetting) {
+        if (allBranchSetting == null) {
+            allBranchSetting = new JSONObject();
+        }
+        this.store.setValue(IRepositoryPrefConstants.REF_PROJECT_BRANCH_SETTING, allBranchSetting.toString());
 
+        save();
+    }
+
+    public JSONObject getAllLocalRefBranchSetting() {
+
+        String strValue = this.store.getString(IRepositoryPrefConstants.REF_PROJECT_BRANCH_SETTING);
+        JSONObject allBranchSetting = null;
+        try {
+            allBranchSetting = new JSONObject(strValue);
+        } catch (Exception e) {
+            allBranchSetting = new JSONObject();
+        }
+        return allBranchSetting;
+    }
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/maven/MavenConstants.java

@@ -17,7 +17,8 @@ package org.talend.core.runtime.maven;
  */
 @SuppressWarnings("nls")
 public interface MavenConstants {
-
+	static final String NAME_GROUP_ID = "GROUP_ID";
+	
     static final String TYPE_JAR = "jar";
 
     static final String DEFAULT_GROUP_ID = "org.talend";

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/process/ITalendProcessJavaProject.java

@@ -146,4 +146,10 @@ public interface ITalendProcessJavaProject {
      */
     void cleanMavenFiles(IProgressMonitor monitor) throws Exception;
 
+    /**
+     * 
+     * Reset the main pom to empty the content of the job dependencies.
+     */
+    void regenerateMainProjectPom(IProgressMonitor monitor) throws Exception;
+
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/projectsetting/ProjectPreferenceManager.java

@@ -12,6 +12,8 @@
 // ============================================================================
 package org.talend.core.runtime.projectsetting;
 
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
 import java.io.IOException;
 
 import org.eclipse.core.resources.IProject;
@@ -25,8 +27,11 @@ import org.eclipse.ui.preferences.ScopedPreferenceStore;
 import org.talend.commons.exception.ExceptionHandler;
 import org.talend.commons.exception.PersistenceException;
 import org.talend.commons.utils.workbench.resources.ResourceUtils;
+import org.talend.core.GlobalServiceRegister;
 import org.talend.core.model.general.Project;
 import org.talend.repository.ProjectManager;
+import org.talend.repository.documentation.ERepositoryActionName;
+import org.talend.repository.model.IRepositoryService;
 
 /**
  * DOC ggu class global comment. Detailled comment
@@ -47,10 +52,20 @@ public final class ProjectPreferenceManager {
     private ProjectScope projectScope;
 
     private IPreferenceStore store;
+    
+    private boolean isCurrentProject;
+    
+    private static IRepositoryService repositoryService;
+    
+    static {
+    	if(GlobalServiceRegister.getDefault().isServiceRegistered(IRepositoryService.class)) {
+    		repositoryService = (IRepositoryService) GlobalServiceRegister.getDefault().getService(IRepositoryService.class);
+    	}
+    }
 
     public ProjectPreferenceManager(String fileName) {
         this(ProjectManager.getInstance().getCurrentProject(), fileName);
-
+        isCurrentProject = true;
     }
 
     public ProjectPreferenceManager(Project p, String fileName) {
@@ -62,12 +77,13 @@ public final class ProjectPreferenceManager {
         } catch (PersistenceException e) {
             ExceptionHandler.process(e);
         }
-
+        addPropertyChangeListener();
     }
 
     public ProjectPreferenceManager(IProject project, String fileName) {
         super();
         init(project, fileName);
+        addPropertyChangeListener();
     }
 
     private void init(IProject project, String fileName) {
@@ -79,11 +95,17 @@ public final class ProjectPreferenceManager {
         this.store = new ScopedPreferenceStore(this.projectScope, this.qualifier);
     }
 
+    private void addPropertyChangeListener() {
+    	if (repositoryService != null) {
+        	repositoryService.getProxyRepositoryFactory().addPropertyChangeListener(new ProjectPreferenceReloadListener());
+        }
+    }
+
     public String getQualifier() {
         return qualifier;
     }
 
-    private IProject getProject() {
+    public IProject getProject() {
         return project;
     }
 
@@ -162,5 +184,27 @@ public final class ProjectPreferenceManager {
             ExceptionHandler.process(e);
         }
     }
+    
+    public void reload() {
+    	if (isCurrentProject) {
+    		try {
+    			Project currentProject = ProjectManager.getInstance().getCurrentProject();
+    			init(ResourceUtils.getProject(currentProject), qualifier);
+    		} catch (PersistenceException e) {
+    			ExceptionHandler.process(e);
+    		}
+    	}
+    }
+
+	class ProjectPreferenceReloadListener implements PropertyChangeListener {
+
+		@Override
+		public void propertyChange(PropertyChangeEvent event) {
+			if (event.getPropertyName().equals(ERepositoryActionName.PROJECT_PREFERENCES_RELOAD.getName())) {
+				reload();
+			}
+		}
+		
+	}
 
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/service/IMetadataManagmentUiService.java

@@ -26,6 +26,8 @@ public interface IMetadataManagmentUiService extends IService {
     public String getAndOpenXSDFileDialog(Path initPath);
 
     public ContextType getContextTypeForContextMode(Connection connection);
+    
+    public ContextType getContextTypeForContextMode(Connection connection, String selectedName, boolean defaultContext);
 
     public String getOriginalValue(ContextType contextType, final String value);
 

main/plugins/org.talend.core.runtime/src/main/java/org/talend/designer/core/IDesignerCoreService.java

@@ -175,6 +175,8 @@ public interface IDesignerCoreService extends IService {
 
     public int getDBConnectionTimeout();
 
+    public int getHBaseOrMaprDBScanLimit();
+
     public Reader getJavadocContentAccessContentReader(IMember member) throws JavaModelException;
 
     public int getTACConnectionTimeout();

main/plugins/org.talend.core.runtime/src/main/java/org/talend/designer/runprocess/IRunProcessService.java

@@ -119,7 +119,8 @@ public interface IRunProcessService extends IService {
 
     public void updateLibraries(Set<ModuleNeeded> jobModuleList, IProcess process);
 
-    public void updateLibraries(Set<ModuleNeeded> jobModuleList, IProcess process, Set<ModuleNeeded> alreadyRetrievedModules);
+    public void updateLibraries(Set<ModuleNeeded> jobModuleList, IProcess process, Set<ModuleNeeded> alreadyRetrievedModules)
+            throws ProcessorException;
 
     public void refreshView();
 
@@ -182,4 +183,5 @@ public interface IRunProcessService extends IService {
 
     Set<String> getLibJarsForBD(IProcess process);
 
+    void updateProjectPomWithTemplate();
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/repository/ProjectManager.java

@@ -15,13 +15,16 @@ package org.talend.repository;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Set;
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.emf.ecore.EObject;
+import org.talend.commons.exception.ExceptionHandler;
 import org.talend.commons.exception.PersistenceException;
 import org.talend.commons.utils.workbench.resources.ResourceUtils;
 import org.talend.core.GlobalServiceRegister;
@@ -38,6 +41,7 @@ import org.talend.core.model.repository.IRepositoryViewObject;
 import org.talend.core.model.repository.RepositoryManager;
 import org.talend.core.model.repository.SVNConstant;
 import org.talend.core.model.utils.TalendPropertiesUtil;
+import org.talend.core.prefs.PreferenceManipulator;
 import org.talend.core.runtime.CoreRuntimePlugin;
 import org.talend.core.ui.IReferencedProjectService;
 import org.talend.repository.model.IProxyRepositoryFactory;
@@ -64,6 +68,10 @@ public final class ProjectManager {
     public static final String NAME_BRANCHES = SVNConstant.NAME_BRANCHES;
 
     public static final String NAME_TAGS = SVNConstant.NAME_TAGS;
+    
+    public static final String BRANCHES_PREFIX = "branches/";
+    
+    public static final String ORIGIN_PREFIX = "origin/";
 
     private static ProjectManager singleton;
 
@@ -72,8 +80,23 @@ public final class ProjectManager {
     private Map<String, String> mapProjectUrlToBranchUrl = new HashMap<String, String>();
 
     private Map<String, List<FolderItem>> foldersMap = new HashMap<String, List<FolderItem>>();
+    
+    private JSONObject allLocalRefBranchSetting = null;
+
+    private Map<String, List<ProjectReference>> allTACProjectProjectReferenceSetting = new HashMap<String, List<ProjectReference>>();
+
+    private Set<String> beforeLogonRecords;
+
+    private Set<String> logonRecords;
+
+    private Set<String> migrationRecords;
 
     private ProjectManager() {
+        PreferenceManipulator prefManipulator = new PreferenceManipulator();
+        allLocalRefBranchSetting = prefManipulator.getAllLocalRefBranchSetting();
+        beforeLogonRecords = new HashSet<String>();
+        logonRecords = new HashSet<String>();
+        migrationRecords = new HashSet<String>();
         initCurrentProject();
     }
 
@@ -100,6 +123,22 @@ public final class ProjectManager {
 
         return null;
     }
+    public Project getProjectFromProjectTechLabel(String label) {
+        if (currentProject == null) {
+            initCurrentProject();
+        }
+
+        if (currentProject.getTechnicalLabel().equals(label)) {
+            return currentProject;
+        }
+        for (Project project : getAllReferencedProjects()) {
+            if (project.getTechnicalLabel().equals(label)) {
+                return project;
+            }
+        }
+
+        return null;
+    }
 
     private void initCurrentProject() {
         Context ctx = CoreRuntimePlugin.getInstance().getContext();
@@ -123,7 +162,7 @@ public final class ProjectManager {
             String parentBranch = ProjectManager.getInstance().getMainProjectBranch(p);
             if (parentBranch != null) {
                 for (ProjectReference pr : (List<ProjectReference>) p.getReferencedProjects()) {
-                    if (pr.getBranch() == null || pr.getBranch().equals(parentBranch)) {
+                    if (ProjectManager.validReferenceProject(p, pr)) {
                         resolveRefProject(pr.getReferencedProject()); // only to resolve all
                     }
                 }
@@ -137,7 +176,7 @@ public final class ProjectManager {
             String parentBranch = ProjectManager.getInstance().getMainProjectBranch(p);
             if (parentBranch != null) {
                 for (ProjectReference pr : (List<ProjectReference>) p.getReferencedProjects()) {
-                    if (pr.getBranch() == null || pr.getBranch().equals(parentBranch)) {
+                    if (ProjectManager.validReferenceProject(p, pr)) {
                         Project project = new Project(pr.getReferencedProject(), false);
                         allReferencedprojects.add(project);
                         resolveSubRefProject(pr.getReferencedProject(), allReferencedprojects); // only to resolve all
@@ -249,11 +288,9 @@ public final class ProjectManager {
             if (project.equals(this.currentProject)) {
                 return getReferencedProjects();
             }
-            String parentBranch = getMainProjectBranch(project);
-
             List<Project> refProjects = new ArrayList<Project>();
             for (ProjectReference refProject : (List<ProjectReference>) project.getEmfProject().getReferencedProjects()) {
-                if (refProject.getBranch() == null || refProject.getBranch().equals(parentBranch)) {
+                if (ProjectManager.validReferenceProject(project.getEmfProject(), refProject)) {
                     refProjects.add(new Project(refProject.getReferencedProject(), false));
                 }
             }
@@ -276,7 +313,7 @@ public final class ProjectManager {
             }
             if (object instanceof Item) {
                 if (((Item) object).getParent() == null) { // may be a routelet from reference project
-                    org.talend.core.model.properties.Project refProject = getRouteletReferenceProject((Item)object);
+                    org.talend.core.model.properties.Project refProject = getProjectFromItemWithoutParent((Item)object);
                     if (refProject != null) {
                         return refProject;
                     }
@@ -295,12 +332,11 @@ public final class ProjectManager {
     }
 
     /*
-     * returns reference project where the given routelet comes from, or null
-     * in case if the routelet is from the current project
+     * Returns the project name found from the current path if the parent is null
      */
-    private org.talend.core.model.properties.Project getRouteletReferenceProject(Item item) {
+    private org.talend.core.model.properties.Project getProjectFromItemWithoutParent(Item item) {
 
-        final String URI_PREFIX = "platform:/resource/";
+        final String URI_PREFIX = "platform:/resource/"; //$NON-NLS-1$
 
         org.talend.core.model.properties.ItemState state = item.getState();
 
@@ -312,21 +348,19 @@ public final class ProjectManager {
                 }
                 String eProxyUriString = eProxyUri.toString();
                 if (eProxyUriString != null && eProxyUriString.startsWith(URI_PREFIX)) {
+                    
                     String tmpString = eProxyUriString.substring(URI_PREFIX.length());
-                    if (!tmpString.contains("/routelets/")) {
-                        return null;
-                    }
-                    String projectLabel = tmpString.substring(0, tmpString.indexOf("/"));
+                    String projectLabel = tmpString.substring(0, tmpString.indexOf("/")); //$NON-NLS-1$
 
                     if (currentProject == null) {
                         initCurrentProject();
                     }
 
-                    if (currentProject.getLabel().equalsIgnoreCase(projectLabel)) {
+                    if (currentProject.getTechnicalLabel().equalsIgnoreCase(projectLabel)) {
                         return currentProject.getEmfProject();
                     }
                     for (Project project : getAllReferencedProjects()) {
-                        if (project.getLabel().equalsIgnoreCase(projectLabel)) {
+                        if (project.getTechnicalLabel().equalsIgnoreCase(projectLabel)) {
                             return project.getEmfProject();
                         }
                     }
@@ -701,4 +735,211 @@ public final class ProjectManager {
         }
         return projectType;
     }
+    
+    public void setLocalRefBranch(org.talend.core.model.properties.Project mainProject, String targetName,
+            List<ProjectReference> projectReferenceList) {
+        if (mainProject == null || targetName == null) {
+            return;
+        }
+        String projectBranchId = getProjectBranchId(mainProject, targetName);
+        try {
+            JSONObject projectRefSetting = null;
+            if (!allLocalRefBranchSetting.isNull(projectBranchId)) {
+                projectRefSetting = allLocalRefBranchSetting.getJSONObject(projectBranchId);
+            } else {
+                projectRefSetting = new JSONObject();
+                allLocalRefBranchSetting.put(projectBranchId, projectRefSetting);
+            }
+            for (ProjectReference projectReference : projectReferenceList) {
+                projectRefSetting.put(projectReference.getReferencedProject().getTechnicalLabel(),
+                        projectReference.getReferencedBranch());
+                projectRefSetting.put(mainProject.getTechnicalLabel(), projectReference.getBranch());
+            }
+            // Save to file
+            PreferenceManipulator prefManipulator = new PreferenceManipulator();
+            prefManipulator.setAllLocalRefBranchSetting(allLocalRefBranchSetting);
+            allLocalRefBranchSetting = prefManipulator.getAllLocalRefBranchSetting();
+        } catch (JSONException e) {
+            ExceptionHandler.process(e);
+        }
+    }
+    
+    public void copyLocalRefBranchFromOtherBranch(org.talend.core.model.properties.Project mainProject, String targetBranch,
+            String sourceBranch) {
+        if (mainProject == null || targetBranch == null) {
+            return;
+        }
+        String projectBranchId = getProjectBranchId(mainProject, sourceBranch);
+        try {
+            JSONObject projectRefSetting = null;
+            if (!allLocalRefBranchSetting.isNull(projectBranchId)) {
+                projectRefSetting = allLocalRefBranchSetting.getJSONObject(projectBranchId);
+                String targetBranchId = getProjectBranchId(mainProject, targetBranch);
+                allLocalRefBranchSetting.put(targetBranchId, projectRefSetting);
+                // Save to file
+                PreferenceManipulator prefManipulator = new PreferenceManipulator();
+                prefManipulator.setAllLocalRefBranchSetting(allLocalRefBranchSetting);
+                allLocalRefBranchSetting = prefManipulator.getAllLocalRefBranchSetting();
+            }
+        } catch (JSONException e) {
+            ExceptionHandler.process(e);
+        }
+    }
+
+    public void deleteLocalRefBranchSetting(org.talend.core.model.properties.Project mainProject, String mainBranch) {
+        if (mainProject == null || mainBranch == null) {
+            return;
+        }
+
+        String projectBranchId = getProjectBranchId(mainProject, mainBranch);
+        if (!allLocalRefBranchSetting.isNull(projectBranchId)) {
+            allLocalRefBranchSetting.remove(projectBranchId);
+            
+            PreferenceManipulator prefManipulator = new PreferenceManipulator();
+            prefManipulator.setAllLocalRefBranchSetting(allLocalRefBranchSetting);
+            allLocalRefBranchSetting = prefManipulator.getAllLocalRefBranchSetting();
+        }
+    }
+
+    private String getProjectBranchId(org.talend.core.model.properties.Project mainProject, String mainBranch) {
+        StringBuffer sb = new StringBuffer();
+        String branchName = getFormatedBranchName(mainBranch);
+        sb.append(mainProject.getTechnicalLabel()).append("@").append(branchName);
+        return sb.toString();
+    }
+    
+    public boolean hasLocalRefBranchSetting(org.talend.core.model.properties.Project mainProject, String mainBranch) {
+        if (mainProject == null || mainBranch == null) {
+            return false;
+        }
+
+        String projectBranchId = getProjectBranchId(mainProject, mainBranch);
+        if (!allLocalRefBranchSetting.isNull(projectBranchId)) {
+            return true;
+        }
+
+        return false;
+    }
+
+    public String getLocalProjectReferenceBranch(org.talend.core.model.properties.Project mainProject, String mainBranch,
+            ProjectReference projectReference) {
+        if (mainProject == null || mainBranch == null) {
+            return null;
+        }
+
+        String projectBranchId = getProjectBranchId(mainProject, mainBranch);
+        JSONObject projectRefSetting = null;
+        try {
+            if (!allLocalRefBranchSetting.isNull(projectBranchId)) {
+                projectRefSetting = allLocalRefBranchSetting.getJSONObject(projectBranchId);
+                if (projectRefSetting != null
+                        && !projectRefSetting.isNull(projectReference.getReferencedProject().getTechnicalLabel())) {
+                    return projectRefSetting.getString(projectReference.getProject().getTechnicalLabel());
+                }
+            }
+        } catch (JSONException e) {
+            ExceptionHandler.process(e);
+        }
+        return null;
+    }
+    
+    public String getLocalProjectReferenceReferenceBranch(org.talend.core.model.properties.Project mainProject, String mainBranch,
+            ProjectReference projectReference) {
+        if (mainProject == null || mainBranch == null) {
+            return null;
+        }
+
+        String projectBranchId = getProjectBranchId(mainProject, mainBranch);
+        JSONObject projectRefSetting = null;
+        try {
+            if (!allLocalRefBranchSetting.isNull(projectBranchId)) {
+                projectRefSetting = allLocalRefBranchSetting.getJSONObject(projectBranchId);
+                if (projectRefSetting != null
+                        && !projectRefSetting.isNull(projectReference.getReferencedProject().getTechnicalLabel())) {
+                    return projectRefSetting.getString(projectReference.getReferencedProject().getTechnicalLabel());
+                }
+            }
+        } catch (JSONException e) {
+            ExceptionHandler.process(e);
+        }
+        return null;
+    }
+
+    public static boolean validReferenceProject(org.talend.core.model.properties.Project mainProject,
+            ProjectReference projectReference) {
+        if (mainProject == null || projectReference == null) {
+            return false;
+        }
+
+        String branchForMainProject = ProjectManager.getInstance().getMainProjectBranch(mainProject);
+        String rBranch4Local = ProjectManager.getInstance().getLocalProjectReferenceBranch(mainProject, branchForMainProject, projectReference);
+        String rRefBranch4Local = ProjectManager.getInstance().getLocalProjectReferenceReferenceBranch(mainProject, branchForMainProject, projectReference);
+        
+        return validReferenceProject(branchForMainProject, rBranch4Local, rRefBranch4Local, projectReference);
+    }
+
+    public static boolean validReferenceProject(String branchForMainProject, String rBranch4Local, String refBranch4Local,
+            ProjectReference projectReference) {
+        if (projectReference == null) {
+            return false;
+        }
+
+        if (projectReference.getBranch() == null
+                || (branchForMainProject != null && (branchForMainProject.equals(projectReference.getBranch())
+                        || branchForMainProject.equals(ORIGIN_PREFIX + projectReference.getBranch())))) {
+            return true;
+        }
+        if (projectReference.getBranch() != null && projectReference.getReferencedBranch() != null) {
+            if (getCleanBranchName(projectReference.getBranch()).equals(getCleanBranchName(rBranch4Local))
+                    && getCleanBranchName(projectReference.getReferencedBranch()).equals(getCleanBranchName(refBranch4Local))) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+    
+    public static String getCleanBranchName(String branchName) {
+        if (branchName == null) {
+            return null;
+        }
+        if (branchName.startsWith(ORIGIN_PREFIX)) {
+            return branchName.substring(ORIGIN_PREFIX.length());
+        }
+        if (branchName.startsWith(BRANCHES_PREFIX)) {
+            return branchName.substring(BRANCHES_PREFIX.length());
+        }
+        return branchName;
+    }
+   
+    public Map<String, List<ProjectReference>> getAllTACProjectProjectReferenceSetting() {
+        return allTACProjectProjectReferenceSetting;
+    }
+    
+    public List<ProjectReference> getTACProjectReferenceList(Project mainProject, String branchName) {
+        List<ProjectReference> list = new ArrayList<ProjectReference>();
+        List<ProjectReference> allProjectReferenceList = allTACProjectProjectReferenceSetting.get(mainProject.getTechnicalLabel());
+        if (allProjectReferenceList != null) {
+            for (ProjectReference projectReference : allProjectReferenceList) {
+                if (projectReference.getBranch().equals(branchName)) {
+                    list.add(projectReference);
+                }
+            }
+        }
+
+        return list;
+    }    
+
+    public Set<String> getBeforeLogonRecords() {
+        return this.beforeLogonRecords;
+    }
+
+    public Set<String> getLogonRecords() {
+        return this.logonRecords;
+    }
+
+    public Set<String> getMigrationRecords() {
+        return this.migrationRecords;
+    }
+
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/repository/documentation/ERepositoryActionName.java

@@ -41,8 +41,9 @@ public enum ERepositoryActionName {
     // for joblet only
     JOBLET_FOLDER_DELETE("joblet.folder.delete"), //$NON-NLS-1$
     JOBLET_FOLDER_RENAME("joblet.folder.rename"), //$NON-NLS-1$
-    JOBLET_FOLDER_MOVE("joblet.folder.move") //$NON-NLS-1$
+    JOBLET_FOLDER_MOVE("joblet.folder.move"), //$NON-NLS-1$
 
+    PROJECT_PREFERENCES_RELOAD("reload project preferences") //$NON-NLS-1$
     ;
 
     private String name;

main/plugins/org.talend.core.runtime/src/main/java/org/talend/repository/model/IProxyRepositoryFactory.java

@@ -258,6 +258,9 @@ public interface IProxyRepositoryFactory {
     public abstract List<IRepositoryViewObject> getAllVersion(Project project, String id, boolean avoidSaveProject)
             throws PersistenceException;
 
+    public abstract List<IRepositoryViewObject> getAllVersion(Project project, String id, String folderPath,
+            ERepositoryObjectType type) throws PersistenceException;
+
     public abstract List<IRepositoryViewObject> getAllVersion(String id) throws PersistenceException;
 
     public abstract IRepositoryViewObject getLastVersion(Project project, String id, String relativeFolder,

main/plugins/org.talend.core.runtime/src/main/java/org/talend/repository/model/RepositoryConstants.java

@@ -29,6 +29,8 @@ public class RepositoryConstants {
 
     public static final String SETTING_DIRECTORY = ".settings"; //$NON-NLS-1$
 
+    public static final String PROJECT_BRANCH_ID = "repository.project.branch"; //$NON-NLS-1$
+
     public static final String IMG_DIRECTORY = "images"; //$NON-NLS-1$
 
     public static final String IMG_DIRECTORY_OF_JOB_OUTLINE = "images/job_outlines"; //$NON-NLS-1$

main/plugins/org.talend.core.ui/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.talend.studio</groupId>
-    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.core.ui</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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.talend.studio</groupId>
+    <artifactId>tcommon-studio-se</artifactId>
+    <version>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.core.ui</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/SelectRepositoryContextDialog.java

@@ -22,6 +22,7 @@ import java.util.Set;
 
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.emf.common.util.EList;
+import org.eclipse.gef.commands.Command;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.CheckStateChangedEvent;
@@ -60,6 +61,7 @@ import org.talend.core.model.process.IContextParameter;
 import org.talend.core.model.properties.ContextItem;
 import org.talend.core.model.properties.Project;
 import org.talend.core.ui.context.cmd.AddRepositoryContextGroupCommand;
+import org.talend.core.ui.editor.command.ContextRemoveParameterCommand;
 import org.talend.core.ui.i18n.Messages;
 import org.talend.designer.core.model.utils.emf.talendfile.ContextParameterType;
 import org.talend.designer.core.model.utils.emf.talendfile.ContextType;
@@ -318,7 +320,7 @@ public class SelectRepositoryContextDialog extends SelectionDialog {
             ContextParameterType param = (ContextParameterType) obj;
             treeViewer.setGrayed(param, false);
             if (helper.existParameterForJob(param)) {
-                treeViewer.setChecked(param, true); // checked always
+                treeViewer.setChecked(param, checked); // checked always
             } else {
                 ContextParameterType existedParam = hasSelectedParam(param);
                 if (existedParam != null && selectedContextName != null) {
@@ -475,16 +477,7 @@ public class SelectRepositoryContextDialog extends SelectionDialog {
                 // modelManager,
                 // helper, paramTypeList);
 
-                if (modelManager.getCommandStack() != null) {
-
-                    modelManager.getCommandStack().execute(addGroupCmd);
-
-                    // modelManager.getCommandStack().execute(addVarCmd);
-
-                } else {
-                    addGroupCmd.execute();
-                    // addVarCmd.execute();
-                }
+                execCommand(addGroupCmd);
 
                 monitor.done();
 
@@ -500,6 +493,14 @@ public class SelectRepositoryContextDialog extends SelectionDialog {
         }
     }
 
+    private void execCommand(Command cmd) {
+        if (modelManager.getCommandStack() != null) {
+            modelManager.getCommandStack().execute(cmd);
+        } else {
+            cmd.execute();
+        }
+    }
+
     @Override
     protected void okPressed() {
         List<ContextItem> selectedItems = getSelectedContextItem();
@@ -514,9 +515,21 @@ public class SelectRepositoryContextDialog extends SelectionDialog {
             }
             progressDialog(selectedItems, contextGoupNameSet, getSelectedContextParameterType());
 
-            modelManager.refresh();
+        } else {
+            IContext defaultContext = manager.getDefaultContext();
+            List<IContextParameter> existParas = new ArrayList<>(defaultContext.getContextParameterList());
+            // remove the params which is unchecked
+            for (IContextParameter param : existParas) {
+                if (param.isBuiltIn()) {
+                    continue;
+                }
+                ContextRemoveParameterCommand cmd = new ContextRemoveParameterCommand(manager, param.getName(), param.getSource());
+                execCommand(cmd);
+            }
         }
 
+        modelManager.refresh();
+
         super.okPressed();
 
     }

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/cmd/AddRepositoryContextGroupCommand.java

@@ -145,10 +145,11 @@ public class AddRepositoryContextGroupCommand extends Command {
         }
 
         // for Parameter
-        if (modelManager == null || helper == null || parameterList == null || parameterList.isEmpty() || manager == null) {
+        if (modelManager == null || helper == null || parameterList == null || manager == null) {
             return;
         }
         newAddParameter.clear();
+        List<IContextParameter> existParas = new ArrayList<>(defaultContext.getContextParameterList());
         for (ContextParameterType defaultContextParamType : parameterList) {
             ContextItem contextItem = (ContextItem) helper.getParentContextItem(defaultContextParamType);
             if (contextItem == null) {
@@ -157,6 +158,7 @@ public class AddRepositoryContextGroupCommand extends Command {
 
             IContextParameter paramExisted = helper.getExistedContextParameter(defaultContextParamType.getName());
             if (paramExisted != null) {
+                existParas.remove(paramExisted);
                 // existed.
                 if (!paramExisted.isBuiltIn() && contextItem.getProperty().getId().equals(paramExisted.getSource())) {
                     // update the parameter.
@@ -174,6 +176,16 @@ public class AddRepositoryContextGroupCommand extends Command {
             }
             monitor.worked(1);
         }
+        
+        //remove the params which is unchecked
+        for(IContextParameter param : existParas){
+            if (param.isBuiltIn()){
+                continue;
+            }
+            new ContextRemoveParameterCommand(manager, param.getName(), param.getSource())
+            .execute();
+        }
+        
     }
 
     /**

main/plugins/org.talend.core/pom.xml

@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.talend.studio</groupId>
-    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.core</artifactId>
-  <packaging>eclipse-plugin</packaging>
-  <build>
-	<plugins>
-	  <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-		<version>2.8.2</version>
-        <executions>
-          <execution>
-            <id>default-deploy</id>
-            <phase>deploy</phase>
-          </execution>
-        </executions>
-      </plugin>
-	</plugins>
-  </build>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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.talend.studio</groupId>
+    <artifactId>tcommon-studio-se</artifactId>
+    <version>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.core</artifactId>
+  <packaging>eclipse-plugin</packaging>
+  <build>
+	<plugins>
+	  <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-deploy-plugin</artifactId>
+		<version>2.8.2</version>
+        <executions>
+          <execution>
+            <id>default-deploy</id>
+            <phase>deploy</phase>
+          </execution>
+        </executions>
+      </plugin>
+	</plugins>
+  </build>
+</project>

main/plugins/org.talend.core/src/main/java/org/talend/designer/runprocess/ProcessorUtilities.java

@@ -73,6 +73,7 @@ import org.talend.core.model.repository.job.JobResource;
 import org.talend.core.model.repository.job.JobResourceManager;
 import org.talend.core.model.utils.JavaResourcesHelper;
 import org.talend.core.model.utils.PerlResourcesHelper;
+import org.talend.core.nexus.TalendLibsServerManager;
 import org.talend.core.runtime.process.ITalendProcessJavaProject;
 import org.talend.core.runtime.process.LastGenerationInfo;
 import org.talend.core.runtime.process.TalendProcessArgumentConstant;
@@ -386,6 +387,7 @@ public class ProcessorUtilities {
 
             isMainJob = true;
             codeModified = false;
+            TalendLibsServerManager.getInstance().checkAndUpdateNexusServer();
 
             // this cache only keep the last main job's generation, so clear it since we regenerate a new job.
             LastGenerationInfo.getInstance().getLastGeneratedjobs().clear();
@@ -737,6 +739,7 @@ public class ProcessorUtilities {
                 // this cache only keep the last main job's generation, so clear it since we regenerate a new job.
                 LastGenerationInfo.getInstance().getLastGeneratedjobs().clear();
                 retrievedJarsForCurrentBuild.clear();
+                TalendLibsServerManager.getInstance().checkAndUpdateNexusServer();
                 // if it's the father, reset the processMap to ensure to have a good
                 // code generation
                 ItemCacheManager.clearCache();

main/plugins/org.talend.cwm.mip.edit/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.talend.studio</groupId>
-    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.cwm.mip.edit</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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.talend.studio</groupId>
+    <artifactId>tcommon-studio-se</artifactId>
+    <version>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.cwm.mip.edit</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

main/plugins/org.talend.cwm.mip.editor/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.talend.studio</groupId>
-    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.cwm.mip.editor</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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.talend.studio</groupId>
+    <artifactId>tcommon-studio-se</artifactId>
+    <version>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.cwm.mip.editor</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

main/plugins/org.talend.cwm.mip/pom.xml

@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.talend.studio</groupId>
-    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.cwm.mip</artifactId>
-  <packaging>eclipse-plugin</packaging>
-  <build>
-	<plugins>
-	  <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-		<version>2.8.2</version>
-        <executions>
-          <execution>
-            <id>default-deploy</id>
-            <phase>deploy</phase>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-compiler-plugin</artifactId>
-        <version>${tycho.version}</version>
-        <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
-        </configuration>
-      </plugin>
-	</plugins>
-  </build>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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.talend.studio</groupId>
+    <artifactId>tcommon-studio-se</artifactId>
+    <version>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.cwm.mip</artifactId>
+  <packaging>eclipse-plugin</packaging>
+  <build>
+	<plugins>
+	  <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-deploy-plugin</artifactId>
+		<version>2.8.2</version>
+        <executions>
+          <execution>
+            <id>default-deploy</id>
+            <phase>deploy</phase>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-compiler-plugin</artifactId>
+        <version>${tycho.version}</version>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+	</plugins>
+  </build>
+</project>

main/plugins/org.talend.datatools.xml/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.talend.studio</groupId>
-    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.datatools.xml</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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.talend.studio</groupId>
+    <artifactId>tcommon-studio-se</artifactId>
+    <version>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.datatools.xml</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

main/plugins/org.talend.designer.maven.tos/pom.xml

@@ -1,37 +1,37 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.talend.studio</groupId>
-		<artifactId>tcommon-studio-se</artifactId>
-		<version>6.3.1-SNAPSHOT</version>
-		<relativePath>../../../</relativePath>
-	</parent>
-	<artifactId>org.talend.designer.maven.tos</artifactId>
-	<packaging>eclipse-plugin</packaging>
-    <dependencies>
-        <dependency>
-            <groupId>org.talend.studio</groupId>
-            <artifactId>studio-maven-repository-unzip</artifactId>
-            <version>${project.version}</version>
-            <type>pom</type>
-        </dependency>
-        <dependency>
-            <groupId>org.talend.studio</groupId>
-            <artifactId>studio-components-dependencies</artifactId>
-            <version>${project.version}</version>
-            <type>pom</type>
-        </dependency>
-        <dependency>
-            <groupId>org.talend.studio</groupId>
-            <artifactId>studio-surefire-dependencies</artifactId>
-            <version>${project.version}</version>
-            <type>pom</type>
-        </dependency>
-        <dependency>
-            <groupId>org.talend.studio</groupId>
-            <artifactId>studio-maven-repository-zip</artifactId>
-            <version>${project.version}</version>
-            <type>pom</type>
-        </dependency>
-    </dependencies></project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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.talend.studio</groupId>
+		<artifactId>tcommon-studio-se</artifactId>
+		<version>6.3.1</version>
+		<relativePath>../../../</relativePath>
+	</parent>
+	<artifactId>org.talend.designer.maven.tos</artifactId>
+	<packaging>eclipse-plugin</packaging>
+    <dependencies>
+        <dependency>
+            <groupId>org.talend.studio</groupId>
+            <artifactId>studio-maven-repository-unzip</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+        </dependency>
+        <dependency>
+            <groupId>org.talend.studio</groupId>
+            <artifactId>studio-components-dependencies</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+        </dependency>
+        <dependency>
+            <groupId>org.talend.studio</groupId>
+            <artifactId>studio-surefire-dependencies</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+        </dependency>
+        <dependency>
+            <groupId>org.talend.studio</groupId>
+            <artifactId>studio-maven-repository-zip</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+        </dependency>
+    </dependencies></project>

main/plugins/org.talend.designer.maven.tos/resources/components/pom.xml

@@ -1,123 +1,123 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.talend.studio</groupId>
-        <artifactId>studio-maven-repository-tos</artifactId>
-        <version>6.3.1-SNAPSHOT</version>
-        <relativePath>../</relativePath>
-    </parent>
-	<artifactId>studio-components-dependencies</artifactId>
-	<packaging>pom</packaging>
-	<properties>
-		<components.version>0.16.0</components.version>
-	</properties>
-	<repositories>
-		<repository>
-			<id>talend_open</id>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-			<url>http://newbuild.talend.com:8081/nexus/content/repositories/TalendOpenSourceRelease/</url>
-		</repository>
-		<repository>
-			<id>talend_open_snapshots</id>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-			<url>http://newbuild.talend.com:8081/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
-		</repository>
-	</repositories>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.talend.components</groupId>
-			<artifactId>components-salesforce</artifactId>
-			<version>${components.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.talend.components</groupId>
-			<artifactId>components-splunk</artifactId>
-			<version>${components.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.talend.components</groupId>
-			<artifactId>components-jira</artifactId>
-			<version>${components.version}</version>
-		</dependency>
-        <dependency>
-            <groupId>org.talend.components</groupId>
-            <artifactId>components-common</artifactId>
-            <version>${components.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.talend.components</groupId>
-            <artifactId>components-common-oauth</artifactId>
-            <version>${components.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.talend.components</groupId>
-            <artifactId>components-api</artifactId>
-            <version>${components.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>biz.aQute.bnd</groupId>
-            <artifactId>annotation</artifactId>
-            <version>2.4.0</version>
-        </dependency>
-		<dependency>
-			<groupId>org.eclipse.sisu</groupId>
-			<artifactId>org.eclipse.sisu.inject</artifactId>
-			<version>0.0.0.M2a</version>
-		</dependency>
-		<dependency>
-			<groupId>javax.enterprise</groupId>
-			<artifactId>cdi-api</artifactId>
-			<version>1.0</version>
-		</dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>1.7.12</version>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <version>4.5.1</version>
-        </dependency>
-	</dependencies>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<version>2.10</version>
-				<executions>
-					<execution>
-						<id>copy-dependencies</id>
-						<phase>package</phase>
-						<goals>
-							<goal>copy-dependencies</goal>
-						</goals>
-						<configuration>
-							<includeScope>runtime</includeScope>
-							<outputDirectory>${basedir}/../tmp/repository</outputDirectory>
-							<useRepositoryLayout>true</useRepositoryLayout>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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.talend.studio</groupId>
+        <artifactId>studio-maven-repository-tos</artifactId>
+        <version>6.3.1</version>
+        <relativePath>../</relativePath>
+    </parent>
+	<artifactId>studio-components-dependencies</artifactId>
+	<packaging>pom</packaging>
+	<properties>
+		<components.version>0.16.0</components.version>
+	</properties>
+	<repositories>
+		<repository>
+			<id>talend_open</id>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+			<url>https://artifacts-zl.talend.com/nexus/content/repositories/TalendOpenSourceRelease/</url>
+		</repository>
+		<repository>
+			<id>talend_open_snapshots</id>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+			<url>https://artifacts-zl.talend.com/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
+		</repository>
+	</repositories>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.talend.components</groupId>
+			<artifactId>components-salesforce</artifactId>
+			<version>${components.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.talend.components</groupId>
+			<artifactId>components-splunk</artifactId>
+			<version>${components.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.talend.components</groupId>
+			<artifactId>components-jira</artifactId>
+			<version>${components.version}</version>
+		</dependency>
+        <dependency>
+            <groupId>org.talend.components</groupId>
+            <artifactId>components-common</artifactId>
+            <version>${components.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.talend.components</groupId>
+            <artifactId>components-common-oauth</artifactId>
+            <version>${components.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.talend.components</groupId>
+            <artifactId>components-api</artifactId>
+            <version>${components.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>biz.aQute.bnd</groupId>
+            <artifactId>annotation</artifactId>
+            <version>2.4.0</version>
+        </dependency>
+		<dependency>
+			<groupId>org.eclipse.sisu</groupId>
+			<artifactId>org.eclipse.sisu.inject</artifactId>
+			<version>0.0.0.M2a</version>
+		</dependency>
+		<dependency>
+			<groupId>javax.enterprise</groupId>
+			<artifactId>cdi-api</artifactId>
+			<version>1.0</version>
+		</dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.7.12</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5.1</version>
+        </dependency>
+	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<version>2.10</version>
+				<executions>
+					<execution>
+						<id>copy-dependencies</id>
+						<phase>package</phase>
+						<goals>
+							<goal>copy-dependencies</goal>
+						</goals>
+						<configuration>
+							<includeScope>runtime</includeScope>
+							<outputDirectory>${basedir}/../tmp/repository</outputDirectory>
+							<useRepositoryLayout>true</useRepositoryLayout>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>

main/plugins/org.talend.designer.maven.tos/resources/pom.xml

@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.talend.studio</groupId>
-        <artifactId>tcommon-studio-se</artifactId>
-        <version>6.3.1-SNAPSHOT</version>
-        <relativePath>../../../../</relativePath>
-    </parent>
-	<artifactId>studio-maven-repository-tos</artifactId>
-	<packaging>pom</packaging>
-    <modules>
-        <module>unzip/pom.xml</module>
-        <module>components/pom.xml</module>
-        <module>surefire/pom.xml</module>
-        <module>zip/pom.xml</module>
-    </modules>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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.talend.studio</groupId>
+        <artifactId>tcommon-studio-se</artifactId>
+        <version>6.3.1</version>
+        <relativePath>../../../../</relativePath>
+    </parent>
+	<artifactId>studio-maven-repository-tos</artifactId>
+	<packaging>pom</packaging>
+    <modules>
+        <module>unzip/pom.xml</module>
+        <module>components/pom.xml</module>
+        <module>surefire/pom.xml</module>
+        <module>zip/pom.xml</module>
+    </modules>
+</project>

main/plugins/org.talend.designer.maven.tos/resources/surefire/pom.xml

@@ -1,57 +1,57 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.talend.studio</groupId>
-        <artifactId>studio-maven-repository-tos</artifactId>
-        <version>6.3.1-SNAPSHOT</version>
-        <relativePath>../</relativePath>
-    </parent>
-	<artifactId>studio-surefire-dependencies</artifactId>
-	<packaging>pom</packaging>
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.maven.surefire</groupId>
-			<artifactId>surefire-junit4</artifactId>
-			<version>2.12.4</version>
-		</dependency>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-core</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.10</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <version>4.2.6</version>
-        </dependency>
-	</dependencies>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<version>2.10</version>
-				<executions>
-					<execution>
-						<id>copy-dependencies</id>
-						<phase>package</phase>
-						<goals>
-							<goal>copy-dependencies</goal>
-						</goals>
-						<configuration>
-							<includeScope>runtime</includeScope>
-							<outputDirectory>${basedir}/../tmp/repository</outputDirectory>
-							<useRepositoryLayout>true</useRepositoryLayout>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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.talend.studio</groupId>
+        <artifactId>studio-maven-repository-tos</artifactId>
+        <version>6.3.1</version>
+        <relativePath>../</relativePath>
+    </parent>
+	<artifactId>studio-surefire-dependencies</artifactId>
+	<packaging>pom</packaging>
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.maven.surefire</groupId>
+			<artifactId>surefire-junit4</artifactId>
+			<version>2.12.4</version>
+		</dependency>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-core</artifactId>
+            <version>1.3</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.10</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.2.6</version>
+        </dependency>
+	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<version>2.10</version>
+				<executions>
+					<execution>
+						<id>copy-dependencies</id>
+						<phase>package</phase>
+						<goals>
+							<goal>copy-dependencies</goal>
+						</goals>
+						<configuration>
+							<includeScope>runtime</includeScope>
+							<outputDirectory>${basedir}/../tmp/repository</outputDirectory>
+							<useRepositoryLayout>true</useRepositoryLayout>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>