APPINT-32905: Issue with Rest service flow

2021-04-30 18:17:02 +03:00
420 changed files with 11885 additions and 1864 deletions
--- a/i18n/features/org.talend.babel.all.tos.feature/feature.xml
+++ b/i18n/features/org.talend.babel.all.tos.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<feature id="org.talend.babel.all.tos.feature" label="Babel feature with all languages for TOS" version="7.4.1.M10"> 
+<feature id="org.talend.babel.all.tos.feature" label="Babel feature with all languages for TOS" version="7.4.1.qualifier"> 
  <description url="http://www.example.com/description">[Enter Feature Description here.]</description>  
  <copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>  
  <license url="http://www.example.com/license">[Enter License Description here.]</license>  
--- a/i18n/features/org.talend.babel.all.tos.feature/pom.xml
+++ b/i18n/features/org.talend.babel.all.tos.feature/pom.xml
@@ -4,7 +4,7 @@
  <parent>
 	<groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M10</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  
--- a/i18n/plugins/org.talend.common.ui.runtime.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.common.ui.runtime.nl/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl
 Bundle-SymbolicName: org.talend.common.ui.runtime.nl
-Bundle-Version: 7.4.1.M10
+Bundle-Version: 7.4.1.qualifier
 Fragment-Host: org.talend.common.ui.runtime
--- a/i18n/plugins/org.talend.common.ui.runtime.nl/pom.xml
+++ b/i18n/plugins/org.talend.common.ui.runtime.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M10</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.common.ui.runtime.nl</artifactId>
--- a/i18n/plugins/org.talend.commons.runtime.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.commons.runtime.nl/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl
 Bundle-SymbolicName: org.talend.commons.runtime.nl
-Bundle-Version: 7.4.1.M10
+Bundle-Version: 7.4.1.qualifier
 Fragment-Host: org.talend.commons.runtime
--- a/i18n/plugins/org.talend.commons.runtime.nl/pom.xml
+++ b/i18n/plugins/org.talend.commons.runtime.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M10</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.commons.runtime.nl</artifactId>
--- a/i18n/plugins/org.talend.commons.ui.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.commons.ui.nl/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Commons UI Nl Fragment
 Bundle-SymbolicName: org.talend.commons.ui.nl
-Bundle-Version: 7.4.1.M10
+Bundle-Version: 7.4.1.qualifier
 Fragment-Host: org.talend.commons.ui
 Bundle-Vendor: .Talend SA.
--- a/i18n/plugins/org.talend.commons.ui.nl/pom.xml
+++ b/i18n/plugins/org.talend.commons.ui.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M10</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.commons.ui.nl</artifactId>
--- a/i18n/plugins/org.talend.core.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.core.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.talend.core.nl Fragment
 Bundle-SymbolicName: org.talend.core.nl
-Bundle-Version: 7.4.1.M10
+Bundle-Version: 7.4.1.qualifier
 Bundle-Vendor: .Talend SA.
 Fragment-Host: org.talend.core
 Bundle-Localization: plugin
--- a/i18n/plugins/org.talend.core.nl/pom.xml
+++ b/i18n/plugins/org.talend.core.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M10</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.core.nl</artifactId>
--- a/i18n/plugins/org.talend.core.repository.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.core.repository.nl/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl
 Bundle-SymbolicName: org.talend.core.repository.nl
-Bundle-Version: 7.4.1.M10
+Bundle-Version: 7.4.1.qualifier
 Fragment-Host: org.talend.core.repository
--- a/i18n/plugins/org.talend.core.repository.nl/pom.xml
+++ b/i18n/plugins/org.talend.core.repository.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M10</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.core.repository.nl</artifactId>
--- a/i18n/plugins/org.talend.core.runtime.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.core.runtime.nl/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl
 Bundle-SymbolicName: org.talend.core.runtime.nl
-Bundle-Version: 7.4.1.M10
+Bundle-Version: 7.4.1.qualifier
 Fragment-Host: org.talend.core.runtime
--- a/i18n/plugins/org.talend.core.runtime.nl/pom.xml
+++ b/i18n/plugins/org.talend.core.runtime.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M10</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.core.runtime.nl</artifactId>
--- a/i18n/plugins/org.talend.core.ui.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.core.ui.nl/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl
 Bundle-SymbolicName: org.talend.core.ui.nl
-Bundle-Version: 7.4.1.M10
+Bundle-Version: 7.4.1.qualifier
 Bundle-Vendor: .Talend SA.
 Fragment-Host: org.talend.core.ui
--- a/i18n/plugins/org.talend.core.ui.nl/pom.xml
+++ b/i18n/plugins/org.talend.core.ui.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M10</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.core.ui.nl</artifactId>
--- a/i18n/plugins/org.talend.cwm.mip.edit.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.cwm.mip.edit.nl/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.cwm.mip.edit.nl
-Bundle-Version: 7.4.1.M10
+Bundle-Version: 7.4.1.qualifier
 Fragment-Host: org.talend.cwm.mip.edit
 Bundle-Vendor: .Talend SA.
--- a/i18n/plugins/org.talend.cwm.mip.edit.nl/pom.xml
+++ b/i18n/plugins/org.talend.cwm.mip.edit.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M10</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.cwm.mip.edit.nl</artifactId>
--- a/i18n/plugins/org.talend.cwm.mip.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.cwm.mip.nl/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.cwm.mip.nl
-Bundle-Version: 7.4.1.M10
+Bundle-Version: 7.4.1.qualifier
 Fragment-Host: org.talend.cwm.mip
 Bundle-Vendor: .Talend SA.
--- a/i18n/plugins/org.talend.cwm.mip.nl/pom.xml
+++ b/i18n/plugins/org.talend.cwm.mip.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M10</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.cwm.mip.nl</artifactId>
--- a/i18n/plugins/org.talend.designer.maven.ui.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.designer.maven.ui.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Designer Maven UI NL
 Bundle-SymbolicName: org.talend.designer.maven.ui.nl
-Bundle-Version: 7.4.1.M10
+Bundle-Version: 7.4.1.qualifier
 Fragment-Host: org.talend.designer.maven.ui
 Bundle-Vendor: .Talend SA.
 Bundle-Localization: plugin
--- a/i18n/plugins/org.talend.designer.maven.ui.nl/pom.xml
+++ b/i18n/plugins/org.talend.designer.maven.ui.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M10</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.designer.maven.ui.nl</artifactId>
--- a/i18n/plugins/org.talend.help.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.help.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.talend.help.Nl Fragment
 Bundle-SymbolicName: org.talend.help.nl
-Bundle-Version: 7.4.1.M10
+Bundle-Version: 7.4.1.qualifier
 Bundle-Vendor: .Talend SA.
 Fragment-Host: org.talend.help
 Bundle-Localization: plugin
--- a/i18n/plugins/org.talend.help.nl/pom.xml
+++ b/i18n/plugins/org.talend.help.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M10</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.help.nl</artifactId>
--- a/i18n/plugins/org.talend.helpers.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.helpers.nl/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.talend.helpers.nl Fragment
 Bundle-SymbolicName: org.talend.helpers.nl
-Bundle-Version: 7.4.1.M10
+Bundle-Version: 7.4.1.qualifier
 Fragment-Host: org.talend.helpers
 Bundle-Vendor: .Talend SA.
--- a/i18n/plugins/org.talend.helpers.nl/pom.xml
+++ b/i18n/plugins/org.talend.helpers.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M10</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.helpers.nl</artifactId>
--- a/i18n/plugins/org.talend.librariesmanager.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.librariesmanager.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.talend.librariesmanager Nl Fragment
 Bundle-SymbolicName: org.talend.librariesmanager.nl
-Bundle-Version: 7.4.1.M10
+Bundle-Version: 7.4.1.qualifier
 Fragment-Host: org.talend.librariesmanager
 Bundle-Localization: plugin
 Bundle-Vendor: .Talend SA.
--- a/i18n/plugins/org.talend.librariesmanager.nl/pom.xml
+++ b/i18n/plugins/org.talend.librariesmanager.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M10</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.librariesmanager.nl</artifactId>
--- a/i18n/plugins/org.talend.librariesmanager.ui.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.librariesmanager.ui.nl/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl
 Bundle-SymbolicName: org.talend.librariesmanager.ui.nl
-Bundle-Version: 7.4.1.M10
+Bundle-Version: 7.4.1.qualifier
 Fragment-Host: org.talend.librariesmanager.ui
--- a/i18n/plugins/org.talend.librariesmanager.ui.nl/pom.xml
+++ b/i18n/plugins/org.talend.librariesmanager.ui.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M10</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.librariesmanager.ui.nl</artifactId>
--- a/i18n/plugins/org.talend.metadata.managment.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.metadata.managment.nl/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl
 Bundle-SymbolicName: org.talend.metadata.managment.nl
-Bundle-Version: 7.4.1.M10
+Bundle-Version: 7.4.1.qualifier
 Fragment-Host: org.talend.metadata.managment
--- a/i18n/plugins/org.talend.metadata.managment.nl/pom.xml
+++ b/i18n/plugins/org.talend.metadata.managment.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M10</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.metadata.managment.nl</artifactId>
--- a/i18n/plugins/org.talend.metadata.managment.ui.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.metadata.managment.ui.nl/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Metadata Managment UI Nl Fragment
 Bundle-SymbolicName: org.talend.metadata.managment.ui.nl
-Bundle-Version: 7.4.1.M10
+Bundle-Version: 7.4.1.qualifier
 Fragment-Host: org.talend.metadata.managment.ui
 Bundle-Vendor: .Talend SA.
--- a/i18n/plugins/org.talend.metadata.managment.ui.nl/pom.xml
+++ b/i18n/plugins/org.talend.metadata.managment.ui.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M10</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.metadata.managment.ui.nl</artifactId>
--- a/i18n/plugins/org.talend.migrationTool.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.migrationTool.nl/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: MigrationTool Plug-in nl fragment
 Bundle-SymbolicName: org.talend.migrationTool.nl
-Bundle-Version: 7.4.1.M10
+Bundle-Version: 7.4.1.qualifier
 Bundle-Vendor: .Talend SA.
 Fragment-Host: org.talend.migrationTool
--- a/i18n/plugins/org.talend.migrationTool.nl/pom.xml
+++ b/i18n/plugins/org.talend.migrationTool.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M10</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.migrationTool.nl</artifactId>
--- a/i18n/plugins/org.talend.model.edit.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.model.edit.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName Nl Fragment
 Bundle-SymbolicName: org.talend.model.edit.nl
-Bundle-Version: 7.4.1.M10
+Bundle-Version: 7.4.1.qualifier
 Fragment-Host: org.talend.model.edit
 Bundle-Localization: plugin
 Bundle-Vendor: %providerName
--- a/i18n/plugins/org.talend.model.edit.nl/pom.xml
+++ b/i18n/plugins/org.talend.model.edit.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M10</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.model.edit.nl</artifactId>
--- a/i18n/plugins/org.talend.model.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.model.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.talend.model.Nl Fragment
 Bundle-SymbolicName: org.talend.model.nl
-Bundle-Version: 7.4.1.M10
+Bundle-Version: 7.4.1.qualifier
 Bundle-Vendor: .Talend SA.
 Fragment-Host: org.talend.model
 Bundle-Localization: plugin
--- a/i18n/plugins/org.talend.model.nl/pom.xml
+++ b/i18n/plugins/org.talend.model.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M10</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.model.nl</artifactId>
--- a/i18n/plugins/org.talend.presentation.onboarding.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.presentation.onboarding.nl/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: NL
 Bundle-SymbolicName: org.talend.presentation.onboarding.nl
-Bundle-Version: 7.4.1.M10
+Bundle-Version: 7.4.1.qualifier
 Fragment-Host: org.talend.presentation.onboarding
--- a/i18n/plugins/org.talend.presentation.onboarding.nl/pom.xml
+++ b/i18n/plugins/org.talend.presentation.onboarding.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M10</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.presentation.onboarding.nl</artifactId>
--- a/i18n/plugins/org.talend.rcp.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.rcp.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.rcp.nl
-Bundle-Version: 7.4.1.M10
+Bundle-Version: 7.4.1.qualifier
 Fragment-Host: org.talend.rcp
 Bundle-Localization: plugin
 Bundle-Vendor: .Talend SA.
--- a/i18n/plugins/org.talend.rcp.nl/pom.xml
+++ b/i18n/plugins/org.talend.rcp.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M10</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.rcp.nl</artifactId>
--- a/i18n/plugins/org.talend.registration.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.registration.nl/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl
 Bundle-SymbolicName: org.talend.registration.nl
-Bundle-Version: 7.4.1.M10
+Bundle-Version: 7.4.1.qualifier
 Fragment-Host: org.talend.registration
--- a/i18n/plugins/org.talend.registration.nl/pom.xml
+++ b/i18n/plugins/org.talend.registration.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M10</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.registration.nl</artifactId>
--- a/i18n/plugins/org.talend.repository.items.importexport.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.repository.items.importexport.nl/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl
 Bundle-SymbolicName: org.talend.repository.items.importexport.nl
-Bundle-Version: 7.4.1.M10
+Bundle-Version: 7.4.1.qualifier
 Fragment-Host: org.talend.repository.items.importexport
--- a/i18n/plugins/org.talend.repository.items.importexport.nl/pom.xml
+++ b/i18n/plugins/org.talend.repository.items.importexport.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M10</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.repository.items.importexport.nl</artifactId>
--- a/i18n/plugins/org.talend.repository.items.importexport.ui.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.repository.items.importexport.ui.nl/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.repository.items.importexport.ui.nl
-Bundle-Version: 7.4.1.M10
+Bundle-Version: 7.4.1.qualifier
 Fragment-Host: org.talend.repository.items.importexport.ui
--- a/i18n/plugins/org.talend.repository.items.importexport.ui.nl/pom.xml
+++ b/i18n/plugins/org.talend.repository.items.importexport.ui.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M10</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.repository.items.importexport.ui.nl</artifactId>
--- a/i18n/plugins/org.talend.repository.localprovider.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.repository.localprovider.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Local repository Plug-in Nl Fragment
 Bundle-SymbolicName: org.talend.repository.localprovider.nl
-Bundle-Version: 7.4.1.M10
+Bundle-Version: 7.4.1.qualifier
 Fragment-Host: org.talend.repository.localprovider
 Bundle-Localization: plugin
 Bundle-Vendor: .Talend SA.
--- a/i18n/plugins/org.talend.repository.localprovider.nl/pom.xml
+++ b/i18n/plugins/org.talend.repository.localprovider.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M10</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.repository.localprovider.nl</artifactId>
--- a/i18n/plugins/org.talend.repository.mdm.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.repository.mdm.nl/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl
 Bundle-SymbolicName: org.talend.repository.mdm.nl
-Bundle-Version: 7.4.1.M10
+Bundle-Version: 7.4.1.qualifier
 Fragment-Host: org.talend.repository.mdm
--- a/i18n/plugins/org.talend.repository.mdm.nl/pom.xml
+++ b/i18n/plugins/org.talend.repository.mdm.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M10</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.repository.mdm.nl</artifactId>
--- a/i18n/plugins/org.talend.repository.metadata.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.repository.metadata.nl/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl
 Bundle-SymbolicName: org.talend.repository.metadata.nl
-Bundle-Version: 7.4.1.M10
+Bundle-Version: 7.4.1.qualifier
 Fragment-Host: org.talend.repository.metadata
--- a/i18n/plugins/org.talend.repository.metadata.nl/pom.xml
+++ b/i18n/plugins/org.talend.repository.metadata.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M10</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.repository.metadata.nl</artifactId>
--- a/i18n/plugins/org.talend.repository.view.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.repository.view.nl/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.repository.view.nl
-Bundle-Version: 7.4.1.M10
+Bundle-Version: 7.4.1.qualifier
 Fragment-Host: org.talend.repository.view
 Bundle-Vendor: .Talend SA.
--- a/i18n/plugins/org.talend.repository.view.nl/pom.xml
+++ b/i18n/plugins/org.talend.repository.view.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M10</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.repository.view.nl</artifactId>
--- a/i18n/plugins/org.talend.resources.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.resources.nl/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.resources.nl
-Bundle-Version: 7.4.1.M10
+Bundle-Version: 7.4.1.qualifier
 Fragment-Host: org.talend.resources
--- a/i18n/plugins/org.talend.resources.nl/pom.xml
+++ b/i18n/plugins/org.talend.resources.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M10</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.resources.nl</artifactId>
--- a/main/features/org.talend.commons.feature/feature.xml
+++ b/main/features/org.talend.commons.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<feature id="org.talend.commons.feature" label="Commons Feature" version="7.4.1.M10" provider-name=".Talend SA."> 
+<feature id="org.talend.commons.feature" label="Commons Feature" version="7.4.1.qualifier" provider-name=".Talend SA."> 
  <description url="http://www.talend.com/online/featuresdescription.html#commons-feature">Complete description about this feature at http://www.talend.com/online/featuresdescription.html#commons-feature</description>  
  <copyright url="http://www.talend.com/online/copyright.txt">Copyright Talend 2006, 2007</copyright>  
  <license>The licence are describe in branding feature</license>  
--- a/main/features/org.talend.commons.feature/pom.xml
+++ b/main/features/org.talend.commons.feature/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M10</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.commons.feature</artifactId>
--- a/main/features/org.talend.core.feature/feature.xml
+++ b/main/features/org.talend.core.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<feature id="org.talend.core.feature" label="Core Feature" version="7.4.1.M10" provider-name=".Talend SA."> 
+<feature id="org.talend.core.feature" label="Core Feature" version="7.4.1.qualifier" provider-name=".Talend SA."> 
  <description url="http://www.talend.com/online/featuresdescription.html#core-feature">Complete description about this feature at http://www.talend.com/online/featuresdescription.html#core-feature</description>  
  <copyright url="http://www.talend.com/online/copyright.txt">Copyright Talend 2006, 2007</copyright>  
  <license>The licence are describe in branding feature</license>  
@@ -62,7 +62,6 @@
  <plugin id="org.talend.metadata.managment.ui" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
  <plugin id="org.talend.metadata.managment.ui.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
  <plugin id="org.talend.migrationTool" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.migrationTool.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
  <plugin id="org.talend.model" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
  <plugin id="org.talend.model.edit" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
  <plugin id="org.talend.model.edit.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
--- a/main/features/org.talend.core.feature/pom.xml
+++ b/main/features/org.talend.core.feature/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M10</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.core.feature</artifactId>
--- a/main/features/org.talend.fragment.jars.common.feature/feature.xml
+++ b/main/features/org.talend.fragment.jars.common.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
      id="org.talend.fragment.jars.common.feature"
      label="Fragment Jars in Common"
-      version="7.4.1.M10">
+      version="7.4.1.qualifier">

   <description url="http://www.example.com/description">
      [Enter Feature Description here.]
@@ -57,4 +57,11 @@
         version="0.0.0"
         unpack="true"/>

+   <plugin
+         id="org.talend.libraries.apache.lucene4"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="true"/>
+
 </feature>
--- a/main/features/org.talend.fragment.jars.common.feature/pom.xml
+++ b/main/features/org.talend.fragment.jars.common.feature/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M10</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.fragment.jars.common.feature</artifactId>
--- a/main/features/org.talend.help.di.feature/feature.xml
+++ b/main/features/org.talend.help.di.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
      id="org.talend.help.di.feature"
      label="Talend DI help feature"
-      version="7.4.1.M10"
+      version="7.4.1.qualifier"
      provider-name=".Talend SA.">

   <description url="http://www.example.com/description">
--- a/main/features/org.talend.help.di.feature/pom.xml
+++ b/main/features/org.talend.help.di.feature/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M10</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.help.di.feature</artifactId>
--- a/main/features/org.talend.help.feature/feature.xml
+++ b/main/features/org.talend.help.feature/feature.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.talend.help.feature" label="Help Feature" version="7.4.1.M10" provider-name=".Talend SA."> 
+<feature id="org.talend.help.feature" label="Help Feature" version="7.4.1.qualifier" provider-name=".Talend SA."> 
  <description url="http://www.talend.com/online/featuresdescription.html#help-feature">Complete description about this feature at http://www.talend.com/online/featuresdescription.html#help-feature</description>  
  <copyright url="http://www.talend.com/online/copyright.txt">Copyright Talend 2006, 2007</copyright>  
  <license>The licence are describe in branding feature</license>  
--- a/main/features/org.talend.help.feature/pom.xml
+++ b/main/features/org.talend.help.feature/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M10</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.help.feature</artifactId>
--- a/main/features/org.talend.jdt.feature/feature.xml
+++ b/main/features/org.talend.jdt.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
      id="org.talend.jdt.feature"
      label="Feature"
-      version="7.4.1.M10">
+      version="7.4.1.qualifier">

   <description url="http://www.example.com/description">
      [Enter Feature Description here.]
--- a/main/features/org.talend.jdt.feature/pom.xml
+++ b/main/features/org.talend.jdt.feature/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M10</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.jdt.feature</artifactId>
--- a/main/features/org.talend.libraries.jdbc.feature/feature.xml
+++ b/main/features/org.talend.libraries.jdbc.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<feature id="org.talend.libraries.jdbc.feature" label="Jdbc_feature Feature" version="7.4.1.M10" provider-name=".Talend SA."> 
+<feature id="org.talend.libraries.jdbc.feature" label="Jdbc_feature Feature" version="7.4.1.qualifier" provider-name=".Talend SA."> 
  <description url="http://www.example.com/description">[Enter Feature Description here.]</description>  
  <copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>  
  <license url="http://www.example.com/license">[Enter License Description here.]</license>  
--- a/main/features/org.talend.libraries.jdbc.feature/pom.xml
+++ b/main/features/org.talend.libraries.jdbc.feature/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M10</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.libraries.jdbc.feature</artifactId>
--- a/main/features/org.talend.m2e.feature/feature.xml
+++ b/main/features/org.talend.m2e.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<feature id="org.talend.m2e.feature" label="Feature" version="7.4.1.M10"> 
+<feature id="org.talend.m2e.feature" label="Feature" version="7.4.1.qualifier"> 
  <description url="http://www.example.com/description">[Enter Feature Description here.]</description>  
  <copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>  
  <license url="http://www.example.com/license">[Enter License Description here.]</license>  
--- a/main/features/org.talend.m2e.feature/pom.xml
+++ b/main/features/org.talend.m2e.feature/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M10</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.m2e.feature</artifactId>
--- a/main/features/org.talend.platform.feature/feature.xml
+++ b/main/features/org.talend.platform.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<feature id="org.talend.platform.feature" label="Platform" version="7.4.1.M10"> 
+<feature id="org.talend.platform.feature" label="Platform" version="7.4.1.qualifier"> 
  <description url="http://www.example.com/description">[Enter Feature Description here.]</description>  
  <copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>  
  <license url="http://www.example.com/license">[Enter License Description here.]</license>  
--- a/main/features/org.talend.platform.feature/pom.xml
+++ b/main/features/org.talend.platform.feature/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M10</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  
--- a/main/features/org.talend.rcp.feature/feature.xml
+++ b/main/features/org.talend.rcp.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
      id="org.talend.rcp.feature"
      label="RCP Feature"
-      version="7.4.1.M10"
+      version="7.4.1.qualifier"
      provider-name=".Talend SA.">

   <description url="http://www.talend.com/online/featuresdescription.html#rcp-feature">
--- a/main/features/org.talend.rcp.feature/pom.xml
+++ b/main/features/org.talend.rcp.feature/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M10</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.rcp.feature</artifactId>
--- a/main/features/org.talend.update.p2.feature/feature.xml
+++ b/main/features/org.talend.update.p2.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<feature id="org.talend.update.p2.feature" label="P2-feature" version="7.4.1.M10"> 
+<feature id="org.talend.update.p2.feature" label="P2-feature" version="7.4.1.qualifier"> 
  <description url="http://www.example.com/description">[Enter Feature Description here.]</description>  
  <copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>  
  <license url="http://www.example.com/license">[Enter License Description here.]</license>  
--- a/main/features/org.talend.update.p2.feature/pom.xml
+++ b/main/features/org.talend.update.p2.feature/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M10</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.update.p2.feature</artifactId>
--- a/main/features/org.talend.updates.feature/feature.xml
+++ b/main/features/org.talend.updates.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<feature id="org.talend.updates.feature" label="Updates-feature" version="7.4.1.M10" provider-name=".Talend SA."> 
+<feature id="org.talend.updates.feature" label="Updates-feature" version="7.4.1.qualifier" provider-name=".Talend SA."> 
  <copyright url="http://www.talend.com/about-us">[Enter Copyright Description here.]</copyright>  
  <plugin id="org.talend.updates.runtime" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
 </feature>
--- a/main/features/org.talend.updates.feature/pom.xml
+++ b/main/features/org.talend.updates.feature/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M10</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.updates.feature</artifactId>
--- a/main/features/org.talend.utils.feature/feature.xml
+++ b/main/features/org.talend.utils.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<feature id="org.talend.utils.feature" label="Utils_feature Feature" version="7.4.1.M10"> 
+<feature id="org.talend.utils.feature" label="Utils_feature Feature" version="7.4.1.qualifier"> 
  <description url="http://www.example.com/description">This feature contains the Talend utilities plugin and its dependencies.</description>  
  <copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>  
  <license url="http://www.example.com/license">[Enter License Description here.]</license>  
--- a/main/features/org.talend.utils.feature/pom.xml
+++ b/main/features/org.talend.utils.feature/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M10</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.utils.feature</artifactId>
--- a/main/plugins/org.talend.common.ui.runtime/META-INF/MANIFEST.MF
+++ b/main/plugins/org.talend.common.ui.runtime/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Common UI runtime Plug-in
 Bundle-SymbolicName: org.talend.common.ui.runtime;singleton:=true
-Bundle-Version: 7.4.1.M10
+Bundle-Version: 7.4.1.qualifier
 Require-Bundle: org.eclipse.core.runtime,
 org.apache.commons.collections,
 org.talend.libraries.dom4j-jaxen,
--- a/main/plugins/org.talend.common.ui.runtime/pom.xml
+++ b/main/plugins/org.talend.common.ui.runtime/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M10</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.common.ui.runtime</artifactId>
--- a/main/plugins/org.talend.commons.runtime/META-INF/MANIFEST.MF
+++ b/main/plugins/org.talend.commons.runtime/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Common Runtime Plug-in
 Bundle-SymbolicName: org.talend.commons.runtime;singleton:=true
-Bundle-Version: 7.4.1.M10
+Bundle-Version: 7.4.1.qualifier
 Require-Bundle: org.apache.log4j;visibility:=reexport,
 org.apache.commons.commons-beanutils,
 org.apache.commons.collections,
--- a/main/plugins/org.talend.commons.runtime/pom.xml
+++ b/main/plugins/org.talend.commons.runtime/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M10</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.commons.runtime</artifactId>
--- a/main/plugins/org.talend.commons.runtime/src/org/talend/commons/runtime/service/ICollectDataService.java
+++ b/main/plugins/org.talend.commons.runtime/src/org/talend/commons/runtime/service/ICollectDataService.java
@@ -1,56 +0,0 @@
-package org.talend.commons.runtime.service;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Properties;
-
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.FrameworkUtil;
-import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.framework.ServiceReference;
-import org.talend.commons.exception.CommonExceptionHandler;
-
-public interface ICollectDataService {
-
-    final String KEY_SOURCE = "source";
-
-    //
-    final String AMC_FILE_TYPE_USED = "FILE_TYPE_USED";
-
-    final String AMC_DATABASE_TYPE_USED = "DATABASE_TYPE_USED";
-
-    final String AMC_PREVIEW_KEY = "amc.datasource";
-
-    final String AMC_PREVIEW_FILEVALUE = "File";
-
-    final String AMC_PREVIEW_DATABASEVALUE = "Database";
-
-    /**
-     * @return json string
-     */
-    String getCollectedDataJSON();
-
-    Properties getCollectedData();
-
-    public static ICollectDataService getInstance(String from) throws Exception {
-        BundleContext bc = FrameworkUtil.getBundle(ICollectDataService.class).getBundleContext();
-        Collection<ServiceReference<ICollectDataService>> tacokitServices = Collections.emptyList();
-        try {
-            tacokitServices = bc.getServiceReferences(ICollectDataService.class, null);
-        } catch (InvalidSyntaxException e) {
-            CommonExceptionHandler.process(e);
-        }
-
-        if (tacokitServices != null) {
-            for (ServiceReference<ICollectDataService> sr : tacokitServices) {
-                if (from == null || from.equals(sr.getProperty(KEY_SOURCE))) {
-                    ICollectDataService tacokitService = bc.getService(sr);
-                    if (tacokitService != null) {
-                        return tacokitService;
-                    }
-                }
-            }
-        }
-        return null;
-    }
-}
--- a/main/plugins/org.talend.commons.runtime/src/org/talend/commons/runtime/service/P2InstallComponent.java
+++ b/main/plugins/org.talend.commons.runtime/src/org/talend/commons/runtime/service/P2InstallComponent.java
@@ -12,8 +12,6 @@
 // ============================================================================
 package org.talend.commons.runtime.service;

-import org.eclipse.core.runtime.IProgressMonitor;
-
 /**
 * DOC ggu class global comment. Detailled comment
 */
@@ -21,10 +19,6 @@ public interface P2InstallComponent {

    boolean install();

-    default boolean install(IProgressMonitor monitor) {
-        return false;
-    }
-
    boolean needRelaunch();

    String getInstalledMessages();
--- a/main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/database/DB2ForZosDataBaseMetadata.java
+++ b/main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/database/DB2ForZosDataBaseMetadata.java
@@ -16,6 +16,7 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.List;

@@ -108,11 +109,11 @@ public class DB2ForZosDataBaseMetadata extends PackageFakeDatabaseMetadata {
        // MOD yyin 2012-05-15 TDQ-5190
        String sql = "SELECT DISTINCT CREATOR FROM SYSIBM.SYSTABLES"; //$NON-NLS-1$
        ResultSet rs = null;
-        PreparedStatement stmt = null;
+        Statement stmt = null;
        List<String[]> list = new ArrayList<String[]>();
        try {
-            stmt = connection.prepareStatement(sql);
-            rs = stmt.executeQuery();
+            stmt = connection.createStatement();
+            rs = stmt.executeQuery(sql);

            while (rs.next()) {
                String creator = rs.getString("CREATOR"); //$NON-NLS-1$
@@ -330,20 +331,18 @@ public class DB2ForZosDataBaseMetadata extends PackageFakeDatabaseMetadata {
    public ResultSet getColumns(String catalog, String schemaPattern, String tableNamePattern, String columnNamePattern)
            throws SQLException {
        // for real
-        String sql = "SELECT * FROM SYSIBM.SYSCOLUMNS where TBNAME=? AND  TBCREATOR = ? ORDER BY TBCREATOR, TBNAME, COLNO"; //$NON-NLS-1$
+        String sql = "SELECT * FROM SYSIBM.SYSCOLUMNS where TBNAME='" + tableNamePattern + "' AND  TBCREATOR = '" //$NON-NLS-1$ //$NON-NLS-2$
+                + schemaPattern + "' ORDER BY TBCREATOR, TBNAME, COLNO"; //$NON-NLS-1$

        // for test
        // String sql = "SELECT * FROM SYSIBM.SYSCOLUMNS where NAME='NAME'";

        ResultSet rs = null;
-        PreparedStatement stmt = null;
+        Statement stmt = null;
        List<String[]> list = new ArrayList<String[]>();
        try {
-            stmt = connection.prepareStatement(sql);
-            stmt.setString(1, tableNamePattern);
-            stmt.setString(2, schemaPattern);
-
-            rs = stmt.executeQuery();
+            stmt = connection.createStatement();
+            rs = stmt.executeQuery(sql);
            while (rs.next()) {

                // For real db2 for zos, should use these code.
--- a/main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/database/JtdsDatabaseMetadata.java
+++ b/main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/database/JtdsDatabaseMetadata.java
@@ -25,6 +25,7 @@ public class JtdsDatabaseMetadata extends PackageFakeDatabaseMetadata {

    @Override
    public ResultSet getSchemas() throws SQLException {
+        java.sql.Statement statement = connection.createStatement();
        String sql;
        if (((PackageFakeDatabaseMetadata) connection).getDatabaseMajorVersion() >= 9) {
            sql = JDBC3 ? "SELECT name AS TABLE_SCHEM, NULL as TABLE_CATALOG FROM " + connection.getCatalog() + ".sys.schemas"
@@ -35,7 +36,6 @@ public class JtdsDatabaseMetadata extends PackageFakeDatabaseMetadata {
        }

        sql += " ORDER BY TABLE_SCHEM";
-        java.sql.PreparedStatement statement = connection.prepareStatement(sql);
-        return statement.executeQuery();
+        return statement.executeQuery(sql);
    }
 }
--- a/main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/database/SAPHanaDataBaseMetadata.java
+++ b/main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/database/SAPHanaDataBaseMetadata.java
@@ -13,9 +13,9 @@
 package org.talend.commons.utils.database;

 import java.sql.Connection;
-import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.List;

@@ -152,19 +152,15 @@ public class SAPHanaDataBaseMetadata extends FakeDatabaseMetaData {
            // check if the type is contained is in the types needed.
            String sqlcv = "SELECT OBJECT_NAME,PACKAGE_ID FROM _SYS_REPO.ACTIVE_OBJECT WHERE OBJECT_SUFFIX = 'calculationview'"; //$NON-NLS-1$
            if (tableNamePattern != null && !tableNamePattern.equals("%")) { //$NON-NLS-1$
-                sqlcv += " AND (OBJECT_NAME LIKE ?"; //$NON-NLS-1$ //$NON-NLS-2$
-                sqlcv += " OR PACKAGE_ID LIKE ? )"; //$NON-NLS-1$ //$NON-NLS-2$
+                sqlcv += " AND (OBJECT_NAME LIKE '" + tableNamePattern + "'"; //$NON-NLS-1$ //$NON-NLS-2$
+                sqlcv += " OR PACKAGE_ID LIKE '" + tableNamePattern + "')"; //$NON-NLS-1$ //$NON-NLS-2$
            }
            ResultSet rscv = null;
-            PreparedStatement stmtcv = null;
+            Statement stmtcv = null;
            List<String[]> listcv = new ArrayList<String[]>();
            try {
-                stmtcv = connection.prepareStatement(sqlcv);
-                if (tableNamePattern != null && !tableNamePattern.equals("%")) {
-                    stmtcv.setString(1, tableNamePattern);
-                    stmtcv.setString(2, tableNamePattern);
-                }
-                rscv = stmtcv.executeQuery();
+                stmtcv = connection.createStatement();
+                rscv = stmtcv.executeQuery(sqlcv);
                while (rscv.next()) {
                    String objectName = rscv.getString("OBJECT_NAME"); //$NON-NLS-1$
                    if (objectName != null) {
@@ -307,11 +303,11 @@ public class SAPHanaDataBaseMetadata extends FakeDatabaseMetaData {
        if (!load) {
            String sqlcv = "SELECT * from \"" + schemaPattern + "\".\"" + tableNamePattern + "\""; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
            ResultSet rscv = null;
-            PreparedStatement stmtcv = null;
+            Statement stmtcv = null;
            List<String[]> listcv = new ArrayList<String[]>();
            try {
-                stmtcv = connection.prepareStatement(sqlcv);
-                rscv = stmtcv.executeQuery();
+                stmtcv = connection.createStatement();
+                rscv = stmtcv.executeQuery(sqlcv);
                int i = 1;
                while (rscv.next()) {
                    String tableName = tableNamePattern;
--- a/main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/database/SASDataBaseMetadata.java
+++ b/main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/database/SASDataBaseMetadata.java
@@ -13,9 +13,9 @@
 package org.talend.commons.utils.database;

 import java.sql.Connection;
-import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.List;

@@ -62,11 +62,11 @@ public class SASDataBaseMetadata extends FakeDatabaseMetaData {
        // see the feature 5827
        String sql = "SELECT DISTINCT LIBNAME FROM SASHELP.VTABLE"; //$NON-NLS-1$
        ResultSet rs = null;
-        PreparedStatement stmt = null;
+        Statement stmt = null;
        List<String[]> list = new ArrayList<String[]>();
        try {
-            stmt = connection.prepareStatement(sql);
-            rs = stmt.executeQuery();
+            stmt = connection.createStatement();
+            rs = stmt.executeQuery(sql);

            while (rs.next()) {
                String creator = rs.getString("LIBNAME"); //$NON-NLS-1$
@@ -147,21 +147,17 @@ public class SASDataBaseMetadata extends FakeDatabaseMetaData {
    public ResultSet getTables(String catalog, String schema, String tableNamePattern, String[] types) throws SQLException {
        String sql;
        if (schema != null) {
-            sql = "SELECT * FROM SASHELP.VTABLE where LIBNAME = ?"; //$NON-NLS-1$ //$NON-NLS-2$
+            sql = "SELECT * FROM SASHELP.VTABLE where LIBNAME = '" + schema + "'"; //$NON-NLS-1$ //$NON-NLS-2$

        } else {
            sql = "SELECT * FROM SASHELP.VTABLE"; //$NON-NLS-1$
        }
        ResultSet rs = null;
-        PreparedStatement stmt = null;
+        Statement stmt = null;
        List<String[]> list = new ArrayList<String[]>();
        try {
-            stmt = connection.prepareStatement(sql);
-            if (schema != null) {
-                stmt.setString(1, schema);
-            }
-
-            rs = stmt.executeQuery();
+            stmt = connection.createStatement();
+            rs = stmt.executeQuery(sql);

            while (rs.next()) {
                String name = rs.getString("MEMNAME"); //$NON-NLS-1$
@@ -233,20 +229,18 @@ public class SASDataBaseMetadata extends FakeDatabaseMetaData {
    public ResultSet getColumns(String catalog, String schemaPattern, String tableNamePattern, String columnNamePattern)
            throws SQLException {
        // for real
-        String sql = "SELECT * FROM SASHELP.VCOLUMN where MEMNAME=? AND  LIBNAME = ? ORDER BY LIBNAME, MEMNAME, VARNUM"; //$NON-NLS-1$
+        String sql = "SELECT * FROM SASHELP.VCOLUMN where MEMNAME='" + tableNamePattern + "' AND  LIBNAME = '" //$NON-NLS-1$ //$NON-NLS-2$
+                + schemaPattern + "' ORDER BY LIBNAME, MEMNAME, VARNUM"; //$NON-NLS-1$

        // for test
        // String sql = "SELECT * FROM SYSIBM.SYSCOLUMNS where NAME='NAME'";

        ResultSet rs = null;
-        PreparedStatement stmt = null;
+        Statement stmt = null;
        List<String[]> list = new ArrayList<String[]>();
        try {
-            stmt = connection.prepareStatement(sql);
-            stmt.setString(1, tableNamePattern);
-            stmt.setString(2, schemaPattern);
-
-            rs = stmt.executeQuery();
+            stmt = connection.createStatement();
+            rs = stmt.executeQuery(sql);
            while (rs.next()) {
                String tableName = rs.getString("MEMNAME"); //$NON-NLS-1$
                if (tableName != null) {
--- a/main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/database/Sybase16SADatabaseMetaData.java
+++ b/main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/database/Sybase16SADatabaseMetaData.java
@@ -13,9 +13,9 @@
 package org.talend.commons.utils.database;

 import java.sql.Connection;
-import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.List;

@@ -52,12 +52,10 @@ public class Sybase16SADatabaseMetaData extends SybaseDatabaseMetaData {
        for (String catalogName : catList) {
            String sql = createSqlByLoginAndCatalog(login, catalogName);
            ResultSet rs = null;
-            PreparedStatement stmt = null;
+            Statement stmt = null;
            try {
-                stmt = connection.prepareStatement(sql);
-                stmt.setString(1, login);
-
-                rs = stmt.executeQuery();
+                stmt = connection.createStatement();
+                rs = stmt.executeQuery(sql);

                while (rs.next()) {
                    int temp = rs.getInt(1);
@@ -115,7 +113,8 @@ public class Sybase16SADatabaseMetaData extends SybaseDatabaseMetaData {
     */
    protected String createSqlByLoginAndCatalog(String loginName, String catalogName) {
        String sql = "select count(*) from " + catalogName
-                + ".dbo.sysusers where suid in (select suid from " + catalogName + ".dbo.syslogins where name = ? )";
+                + ".dbo.sysusers where suid in (select suid from "+catalogName+".dbo.syslogins where name = '" + loginName
+                + "')";
        return sql;
    }

--- a/main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/database/SybaseDatabaseMetaData.java
+++ b/main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/database/SybaseDatabaseMetaData.java
@@ -13,9 +13,9 @@
 package org.talend.commons.utils.database;

 import java.sql.Connection;
-import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.List;

@@ -54,13 +54,10 @@ public class SybaseDatabaseMetaData extends PackageFakeDatabaseMetadata {
        for (String catalogName : catList) {
            String sql = createSqlByLoginAndCatalog(login, catalogName);
            ResultSet rs = null;
-            PreparedStatement stmt = null;
+            Statement stmt = null;
            try {
-                stmt = connection.prepareStatement(sql);
-                stmt.setString(1, login);
-                stmt.setString(2, login);
-
-                rs = stmt.executeQuery();
+                stmt = connection.createStatement();
+                rs = stmt.executeQuery(sql);

                while (rs.next()) {
                    int temp = rs.getInt(1);
@@ -95,11 +92,11 @@ public class SybaseDatabaseMetaData extends PackageFakeDatabaseMetadata {
    public ResultSet getSchemas(String catalog, String schemaPattern) throws SQLException {
        String sql = "SELECT DISTINCT name FROM " + catalog + ".dbo.sysusers where suid > 0"; //$NON-NLS-1$ //$NON-NLS-2$
        ResultSet rs = null;
-        PreparedStatement stmt = null;
+        Statement stmt = null;
        List<String[]> list = new ArrayList<String[]>();
        try {
-            stmt = connection.prepareStatement(sql);
-            rs = stmt.executeQuery();
+            stmt = connection.createStatement();
+            rs = stmt.executeQuery(sql);

            while (rs.next()) {
                String name = rs.getString("name"); //$NON-NLS-1$
@@ -139,9 +136,9 @@ public class SybaseDatabaseMetaData extends PackageFakeDatabaseMetadata {
     */
    protected String createSqlByLoginAndCatalog(String loginName, String catalogName) {
        return "select count(*) from " + catalogName //$NON-NLS-1$
-                + ".dbo.sysusers where suid in (select suid from master.dbo.syslogins where name = ?"
-                + ") or suid in (select altsuid from " + catalogName //$NON-NLS-1$
-                + ".dbo.sysalternates a, master.dbo.syslogins b where b.name = ? and a.suid = b.suid)"; //$NON-NLS-1$ //$NON-NLS-2$
+                + ".dbo.sysusers where suid in (select suid from master.dbo.syslogins where name = '" + loginName //$NON-NLS-1$
+                + "') or suid in (select altsuid from " + catalogName //$NON-NLS-1$
+                + ".dbo.sysalternates a, master.dbo.syslogins b where b.name = '" + loginName + "' and a.suid = b.suid)"; //$NON-NLS-1$ //$NON-NLS-2$
    }

    @Override
--- a/main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/database/TeradataDataBaseMetadata.java
+++ b/main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/database/TeradataDataBaseMetadata.java
@@ -13,9 +13,9 @@
 package org.talend.commons.utils.database;

 import java.sql.Connection;
-import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.List;

@@ -97,12 +97,13 @@ public class TeradataDataBaseMetadata extends FakeDatabaseMetaData {
        int dbMajorVersion = connection.getMetaData().getDatabaseMajorVersion();
        String sql = "HELP COLUMN \"" + schema + "\".\"" + table + "\".* ";//$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$
        ResultSet rs = null;
-        PreparedStatement stmt = null;
+        Statement stmt = null;
        String columnName = null;
        List<String[]> list = new ArrayList<String[]>();
        try {
            if (dbMajorVersion > 12) {
-                sql = "SELECT * from DBC.INDICESV WHERE UPPER(databasename) = UPPER(?) AND UPPER(tablename) = UPPER(?) AND UPPER(UniqueFlag) = UPPER('Y')"; //$NON-NLS-1$ //$NON-NLS-2$
+                sql = "SELECT * from DBC.INDICESV WHERE UPPER(databasename) = UPPER('" + schema //$NON-NLS-1$
+                        + "') AND UPPER(tablename) = UPPER('" + table + "') AND UPPER(UniqueFlag) = UPPER('Y')"; //$NON-NLS-1$//$NON-NLS-2$
                rs = getResultSet(catalog, schema, table, sql);
                while (rs.next()) {
                    columnName = rs.getString("ColumnName").trim(); //$NON-NLS-1$
@@ -111,11 +112,8 @@ public class TeradataDataBaseMetadata extends FakeDatabaseMetaData {
                    list.add(r);
                }
            } else {
-                stmt = connection.prepareStatement(sql);
-                stmt.setString(1, schema);
-                stmt.setString(2, table);
-
-                rs = stmt.executeQuery();
+                stmt = connection.createStatement();
+                rs = stmt.executeQuery(sql);
                while (rs.next()) {
                    columnName = rs.getString("Column Name").trim(); //$NON-NLS-1$
                    String pk = rs.getString("Primary?");//$NON-NLS-1$
@@ -140,10 +138,10 @@ public class TeradataDataBaseMetadata extends FakeDatabaseMetaData {

    public ResultSet getResultSet(String catalog, String schema, String table, String sql) throws SQLException {
        ResultSet rs = null;
-        PreparedStatement stmt = null;
+        Statement stmt = null;
        try {
-            stmt = connection.prepareStatement(sql);
-            rs = stmt.executeQuery();
+            stmt = connection.createStatement();
+            rs = stmt.executeQuery(sql);
        } catch (SQLException e) {
            throw new RuntimeException(e);
        }
@@ -205,15 +203,17 @@ public class TeradataDataBaseMetadata extends FakeDatabaseMetaData {
            sysTable = "DBC.TABLESV";//$NON-NLS-1$
        }
        if (types != null && types.length > 0) {
-            sql = "SELECT * from " + sysTable + " WHERE UPPER(databasename) = UPPER(?) AND tablekind " + addTypesToSql(types); //$NON-NLS-1$
+            sql = "SELECT * from " + sysTable + " WHERE UPPER(databasename) = UPPER('" + database //$NON-NLS-1$//$NON-NLS-2$
+                    + "') AND tablekind " + addTypesToSql(types); //$NON-NLS-1$
        } else {
            // When the types is empty, all the tables and views will be retrieved.
-            sql = "SELECT * from " + sysTable + " WHERE UPPER(databasename) = UPPER(?) AND (tablekind = 'T' or tablekind = 'V')"; //$NON-NLS-1$
+            sql = "SELECT * from " + sysTable + " WHERE UPPER(databasename) = UPPER('" + database //$NON-NLS-1$//$NON-NLS-2$
+                    + "') AND (tablekind = 'T' or tablekind = 'V')"; //$NON-NLS-1$
        }

        // add the filter for table/views
        if (!StringUtils.isEmpty(tableNamePattern)) {
-            sql = sql + " AND tablename LIKE ?";//$NON-NLS-1$ //$NON-NLS-2$
+            sql = sql + " AND tablename LIKE '" + tableNamePattern + "'";//$NON-NLS-1$//$NON-NLS-2$
        }

        if (types != null && types.length > 0) {
@@ -223,18 +223,11 @@ public class TeradataDataBaseMetadata extends FakeDatabaseMetaData {
        }

        ResultSet rs = null;
-        PreparedStatement stmt = null;
+        Statement stmt = null;
        List<String[]> list = new ArrayList<String[]>();
        try {
-            stmt = connection.prepareStatement(sql);
-            stmt.setString(1, database);
-
-            // add the filter for table/views
-            if (!StringUtils.isEmpty(tableNamePattern)) {
-                stmt.setString(2, tableNamePattern);
-            }
-
-            rs = stmt.executeQuery();
+            stmt = connection.createStatement();
+            rs = stmt.executeQuery(sql);

            while (rs.next()) {
                String name = rs.getString("TableName").trim(); //$NON-NLS-1$
@@ -333,33 +326,21 @@ public class TeradataDataBaseMetadata extends FakeDatabaseMetaData {
        if (!StringUtils.isEmpty(database)) {
            sql = "HELP COLUMN \"" + database + "\".\"" + tableNamePattern + "\".* ";//$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$
            if (dbMajorVersion > 12) {
-                sql = "SELECT * from DBC.COLUMNSV WHERE UPPER(databasename) = UPPER(?) AND UPPER(tablename) = UPPER(?)" //$NON-NLS-1$
-                        + " Order by tablename "; //$NON-NLS-1$ //$NON-NLS-3$
+                sql = "SELECT * from DBC.COLUMNSV WHERE UPPER(databasename) = UPPER('" + database //$NON-NLS-1$
+                        + "') AND UPPER(tablename) = UPPER('" + tableNamePattern + "')" + " Order by tablename "; //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$
            }
        } else {
            sql = "HELP COLUMN \"" + tableNamePattern + "\".* ";//$NON-NLS-1$//$NON-NLS-2$
            if (dbMajorVersion > 12) {
-                sql = "SELECT * from DBC.COLUMNSV WHERE UPPER(tablename) = UPPER(?)" + " Order by tablename "; //$NON-NLS-1$//$NON-NLS-2$
-                                                                                                               // //$NON-NLS-3$
+                sql = "SELECT * from DBC.COLUMNSV WHERE UPPER(tablename) = UPPER('" + tableNamePattern + "')" + " Order by tablename "; //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$
            }
        }
        ResultSet rs = null;
-        PreparedStatement stmt = null;
+        Statement stmt = null;
        List<String[]> list = new ArrayList<String[]>();
        try {
-            stmt = connection.prepareStatement(sql);
-            if (!StringUtils.isEmpty(database)) {
-                if (dbMajorVersion > 12) {
-                    stmt.setString(1, database);
-                    stmt.setString(2, tableNamePattern);
-                }
-            } else {
-                if (dbMajorVersion > 12) {
-                    stmt.setString(1, tableNamePattern);
-                }
-            }
-
-            rs = stmt.executeQuery();
+            stmt = connection.createStatement();
+            rs = stmt.executeQuery(sql);
            while (rs.next()) {
                String tableName = tableNamePattern;
                String columnName = null;
--- a/main/plugins/org.talend.commons.ui/META-INF/MANIFEST.MF
+++ b/main/plugins/org.talend.commons.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Common UI Plug-in
 Bundle-SymbolicName: org.talend.commons.ui;singleton:=true
-Bundle-Version: 7.4.1.M10
+Bundle-Version: 7.4.1.qualifier
 Require-Bundle: org.eclipse.core.runtime,
 org.eclipse.core.resources,
 org.eclipse.jface.text,
--- a/Show More
+++ b/Show More