update tomcat version

fix(I18N-322):change a message to "Set the connection and read timeouts" (#7060 )
jill/fix/master/APPINT-33992 (#7070 )
2022-01-12 23:08:30 +08:00 · 2022-01-12 16:18:35 +08:00 · 2022-01-12 15:57:18 +08:00 · 2022-01-11 18:48:01 +08:00 · 2022-01-07 10:41:34 +08:00 · 2022-01-07 09:41:55 +08:00
2213 changed files with 6648 additions and 83110 deletions
--- a/main/features/org.talend.designer.feature/feature.xml
+++ b/main/features/org.talend.designer.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<feature id="org.talend.designer.feature" label="Designer Feature" version="8.0.1.qualifier" provider-name=".Talend SA."> 
+<feature id="org.talend.designer.feature" label="Designer Feature" version="8.8.8.qualifier" provider-name=".Talend SA."> 
  <description url="http://www.talend.com/online/featuresdescription.html#designer-feature">Complete description about this feature at http://www.talend.com/online/featuresdescription.html#designer-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.designer.feature/pom.xml
+++ b/main/features/org.talend.designer.feature/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
+    <version>8.8.8-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.designer.feature</artifactId>
--- a/main/features/org.talend.fragment.jars.di.feature/feature.xml
+++ b/main/features/org.talend.fragment.jars.di.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
      id="org.talend.fragment.jars.di.feature"
      label="Fragment Jars in DI"
-      version="8.0.1.qualifier">
+      version="8.8.8.qualifier">

   <description url="http://www.example.com/description">
      [Enter Feature Description here.]
--- a/main/features/org.talend.fragment.jars.di.feature/pom.xml
+++ b/main/features/org.talend.fragment.jars.di.feature/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
+    <version>8.8.8-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.fragment.jars.di.feature</artifactId>
--- a/main/features/org.talend.gmf.feature/feature.xml
+++ b/main/features/org.talend.gmf.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
      id="org.talend.gmf.feature"
      label="Gmf"
-      version="8.0.1.qualifier">
+      version="8.8.8.qualifier">

   <description url="http://www.example.com/description">
      GMF
--- a/main/features/org.talend.gmf.feature/feature_ja.properties
+++ b/main/features/org.talend.gmf.feature/feature_ja.properties
--- a/main/features/org.talend.gmf.feature/pom.xml
+++ b/main/features/org.talend.gmf.feature/pom.xml
@@ -4,9 +4,9 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
+    <version>8.8.8-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.gmf.feature</artifactId>
  <packaging>eclipse-feature</packaging>
-</project>
+</project>
--- a/main/features/org.talend.rcp.branding.tos.feature/feature.xml
+++ b/main/features/org.talend.rcp.branding.tos.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<feature id="org.talend.rcp.branding.tos.feature" label="Tos branding feature" version="8.0.1.qualifier" provider-name=".Talend SA." plugin="org.talend.rcp.branding.tos"> 
+<feature id="org.talend.rcp.branding.tos.feature" label="Tos branding feature" version="8.8.8.qualifier" provider-name=".Talend SA." plugin="org.talend.rcp.branding.tos"> 
  <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>[Enter License Description here.]</license>  
--- a/main/features/org.talend.rcp.branding.tos.feature/pom.xml
+++ b/main/features/org.talend.rcp.branding.tos.feature/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
+    <version>8.8.8-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.rcp.branding.tos.feature</artifactId>
--- a/main/features/org.talend.rcp.branding.tos.test.feature/feature.xml
+++ b/main/features/org.talend.rcp.branding.tos.test.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<feature id="org.talend.rcp.branding.tos.test.feature" label="Test feature for TOS" version="8.0.1.qualifier"> 
+<feature id="org.talend.rcp.branding.tos.test.feature" label="Test feature for TOS" version="8.8.8.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.rcp.branding.tos.test.feature/pom.xml
+++ b/main/features/org.talend.rcp.branding.tos.test.feature/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
+    <version>8.8.8-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.rcp.branding.tos.test.feature</artifactId>
--- a/main/features/org.talend.repository.feature/feature.xml
+++ b/main/features/org.talend.repository.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<feature id="org.talend.repository.feature" label="Repository Feature" version="8.0.1.qualifier" provider-name=".Talend SA."> 
+<feature id="org.talend.repository.feature" label="Repository Feature" version="8.8.8.qualifier" provider-name=".Talend SA."> 
  <description url="http://www.talend.com/online/featuresdescription.html#repository-feature">Complete description about this feature at http://www.talend.com/online/featuresdescription.html#repository-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.repository.feature/pom.xml
+++ b/main/features/org.talend.repository.feature/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
+    <version>8.8.8-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.repository.feature</artifactId>
--- a/main/features/org.talend.studio.components.tcompv0.azurestorage.feature/feature.xml
+++ b/main/features/org.talend.studio.components.tcompv0.azurestorage.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
      id="org.talend.studio.components.tcompv0.azurestorage.feature"
      label="Azure Storage"
-      version="8.0.1.qualifier">
+      version="8.8.8.qualifier">

   <description url="http://www.example.com/description">
      Azure Storage
--- a/main/features/org.talend.studio.components.tcompv0.azurestorage.feature/pom.xml
+++ b/main/features/org.talend.studio.components.tcompv0.azurestorage.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>tdi-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.studio.components.tcompv0.azurestorage.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>tdi-studio-se</artifactId>
+    <version>8.8.8-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.studio.components.tcompv0.azurestorage.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>
--- a/main/features/org.talend.studio.components.tcompv0.googledrive.feature/feature.xml
+++ b/main/features/org.talend.studio.components.tcompv0.googledrive.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
      id="org.talend.studio.components.tcompv0.googledrive.feature"
      label="Google Drive"
-      version="8.0.1.qualifier">
+      version="8.8.8.qualifier">

   <description url="http://www.example.com/description">
      Google drive component
--- a/main/features/org.talend.studio.components.tcompv0.googledrive.feature/pom.xml
+++ b/main/features/org.talend.studio.components.tcompv0.googledrive.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>tdi-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.studio.components.tcompv0.googledrive.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>tdi-studio-se</artifactId>
+    <version>8.8.8-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.studio.components.tcompv0.googledrive.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>
--- a/main/features/org.talend.studio.components.tcompv0.jdbc.feature/feature.xml
+++ b/main/features/org.talend.studio.components.tcompv0.jdbc.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
      id="org.talend.studio.components.tcompv0.jdbc.feature"
      label="JDBC_feature"
-      version="8.0.1.qualifier">
+      version="8.8.8.qualifier">

   <description url="http://www.example.com/description">
      [Enter Feature Description here.]
--- a/main/features/org.talend.studio.components.tcompv0.jdbc.feature/pom.xml
+++ b/main/features/org.talend.studio.components.tcompv0.jdbc.feature/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
+    <version>8.8.8-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.studio.components.tcompv0.jdbc.feature</artifactId>
--- a/main/features/org.talend.studio.components.tcompv0.jira.feature/feature.xml
+++ b/main/features/org.talend.studio.components.tcompv0.jira.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
      id="org.talend.studio.components.tcompv0.jira.feature"
      label="Jira"
-      version="8.0.1.qualifier">
+      version="8.8.8.qualifier">

   <description url="http://www.example.com/description">
      Jira component
--- a/main/features/org.talend.studio.components.tcompv0.jira.feature/pom.xml
+++ b/main/features/org.talend.studio.components.tcompv0.jira.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>tdi-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.studio.components.tcompv0.jira.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>tdi-studio-se</artifactId>
+    <version>8.8.8-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.studio.components.tcompv0.jira.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>
--- a/main/features/org.talend.studio.components.tcompv0.marketo.feature/feature.xml
+++ b/main/features/org.talend.studio.components.tcompv0.marketo.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
      id="org.talend.studio.components.tcompv0.marketo.feature"
      label="Marketo"
-      version="8.0.1.qualifier">
+      version="8.8.8.qualifier">

   <description url="http://www.example.com/description">
      Marketo component
--- a/main/features/org.talend.studio.components.tcompv0.marketo.feature/pom.xml
+++ b/main/features/org.talend.studio.components.tcompv0.marketo.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>tdi-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.studio.components.tcompv0.marketo.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>tdi-studio-se</artifactId>
+    <version>8.8.8-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.studio.components.tcompv0.marketo.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>
--- a/main/features/org.talend.studio.components.tcompv0.marklogic.feature/feature.xml
+++ b/main/features/org.talend.studio.components.tcompv0.marklogic.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
      id="org.talend.studio.components.tcompv0.marklogic.feature"
      label="Marklogic"
-      version="8.0.1.qualifier">
+      version="8.8.8.qualifier">

   <description url="http://www.example.com/description">
      Marklogic component
--- a/main/features/org.talend.studio.components.tcompv0.marklogic.feature/pom.xml
+++ b/main/features/org.talend.studio.components.tcompv0.marklogic.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>tdi-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.studio.components.tcompv0.marklogic.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>tdi-studio-se</artifactId>
+    <version>8.8.8-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.studio.components.tcompv0.marklogic.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>
--- a/main/features/org.talend.studio.components.tcompv0.netsuite.feature/feature.xml
+++ b/main/features/org.talend.studio.components.tcompv0.netsuite.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
      id="org.talend.studio.components.tcompv0.netsuite.feature"
      label="Netsuite"
-      version="8.0.1.qualifier">
+      version="8.8.8.qualifier">

   <description url="http://www.example.com/description">
      Netsuite
--- a/main/features/org.talend.studio.components.tcompv0.netsuite.feature/pom.xml
+++ b/main/features/org.talend.studio.components.tcompv0.netsuite.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>tdi-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.studio.components.tcompv0.netsuite.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>tdi-studio-se</artifactId>
+    <version>8.8.8-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.studio.components.tcompv0.netsuite.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>
--- a/main/features/org.talend.studio.components.tcompv0.salesforce.feature/feature.xml
+++ b/main/features/org.talend.studio.components.tcompv0.salesforce.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
      id="org.talend.studio.components.tcompv0.salesforce.feature"
      label="Salesforce"
-      version="8.0.1.qualifier">
+      version="8.8.8.qualifier">

   <description url="http://www.example.com/description">
      Salesforce component
--- a/main/features/org.talend.studio.components.tcompv0.salesforce.feature/pom.xml
+++ b/main/features/org.talend.studio.components.tcompv0.salesforce.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>tdi-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.studio.components.tcompv0.salesforce.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>tdi-studio-se</artifactId>
+    <version>8.8.8-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.studio.components.tcompv0.salesforce.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>
--- a/main/features/org.talend.studio.components.tcompv0.snowflake.feature/feature.xml
+++ b/main/features/org.talend.studio.components.tcompv0.snowflake.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
      id="org.talend.studio.components.tcompv0.snowflake.feature"
      label="SNOWFLAKE_feature"
-      version="8.0.1.qualifier">
+      version="8.8.8.qualifier">

   <description url="http://www.example.com/description">
      Snowflake
--- a/main/features/org.talend.studio.components.tcompv0.snowflake.feature/pom.xml
+++ b/main/features/org.talend.studio.components.tcompv0.snowflake.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>tdi-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.studio.components.tcompv0.snowflake.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>tdi-studio-se</artifactId>
+    <version>8.8.8-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.studio.components.tcompv0.snowflake.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>
--- a/main/features/org.talend.studio.components.tcompv0.splunk.feature/feature.xml
+++ b/main/features/org.talend.studio.components.tcompv0.splunk.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
      id="org.talend.studio.components.tcompv0.splunk.feature"
      label="Splunk"
-      version="8.0.1.qualifier">
+      version="8.8.8.qualifier">

   <description url="http://www.example.com/description">
      Splunk component
--- a/main/features/org.talend.studio.components.tcompv0.splunk.feature/pom.xml
+++ b/main/features/org.talend.studio.components.tcompv0.splunk.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>tdi-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.studio.components.tcompv0.splunk.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>tdi-studio-se</artifactId>
+    <version>8.8.8-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.studio.components.tcompv0.splunk.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>
--- a/main/features/org.talend.tos.components.feature/feature.xml
+++ b/main/features/org.talend.tos.components.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
      id="org.talend.tos.components.feature"
      label="Components-feature"
-      version="8.0.1.qualifier">
+      version="8.8.8.qualifier">

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

-<feature id="org.talend.tos.core.feature" label="Feature" version="8.0.1.qualifier"> 
+<feature id="org.talend.tos.core.feature" label="Feature" version="8.8.8.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.tos.core.feature/pom.xml
+++ b/main/features/org.talend.tos.core.feature/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
+    <version>8.8.8-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.tos.core.feature</artifactId>
--- a/main/features/org.talend.tos.feature/feature.xml
+++ b/main/features/org.talend.tos.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<feature id="org.talend.tos.feature" label="Tos feature" version="8.0.1.qualifier" provider-name=".Talend SA.">
+<feature id="org.talend.tos.feature" label="Tos feature" version="8.8.8.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>[Enter License Description here.]</license>
--- a/main/features/org.talend.tos.feature/pom.xml
+++ b/main/features/org.talend.tos.feature/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
+    <version>8.8.8-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.tos.feature</artifactId>
--- a/main/features/org.talend.tos.libraries.feature/feature.xml
+++ b/main/features/org.talend.tos.libraries.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<feature id="org.talend.tos.libraries.feature" label="Libraries_feature" version="8.0.1.qualifier"> 
+<feature id="org.talend.tos.libraries.feature" label="Libraries_feature" version="8.8.8.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>  
@@ -43,7 +43,6 @@
  <plugin id="org.talend.libraries.palo" download-size="0" install-size="0" version="0.0.0"/>
  <plugin id="org.talend.libraries.persist.lookup" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
  <plugin id="org.talend.libraries.salesforce" download-size="0" install-size="0" version="0.0.0"/>
-  <plugin id="org.talend.libraries.servlet" download-size="0" install-size="0" version="0.0.0"/>
  <plugin id="org.talend.libraries.slf4j" download-size="0" install-size="0" version="0.0.0"/>
  <plugin id="org.talend.libraries.xml" download-size="0" install-size="0" version="0.0.0"/>
  <plugin id="org.talend.libraries.zmq" download-size="0" install-size="0" version="0.0.0"/>
--- a/main/features/org.talend.tos.libraries.feature/pom.xml
+++ b/main/features/org.talend.tos.libraries.feature/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
+    <version>8.8.8-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.tos.libraries.feature</artifactId>
--- a/main/plugins/org.talend.designer.abstractmap/META-INF/MANIFEST.MF
+++ b/main/plugins/org.talend.designer.abstractmap/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Abstract Map Plug-in
 Bundle-SymbolicName: org.talend.designer.abstractmap;singleton:=true
-Bundle-Version: 8.0.1.qualifier
+Bundle-Version: 8.8.8.qualifier
 Bundle-Activator: org.talend.designer.abstractmap.MapPlugin
 Require-Bundle: org.eclipse.core.runtime,
 org.talend.core,
--- a/main/plugins/org.talend.designer.abstractmap/pom.xml
+++ b/main/plugins/org.talend.designer.abstractmap/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
+    <version>8.8.8-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.designer.abstractmap</artifactId>
--- a/main/plugins/org.talend.designer.abstractmap/src/java/main/messages_ja.properties
+++ b/main/plugins/org.talend.designer.abstractmap/src/java/main/messages_ja.properties
@@ -3,18 +3,18 @@ prefs.configuration.LINK_STYLE=\u30C7\u30D5\u30A9\u30EB\u30C8\u30DE\u30C3\u30D4\
 prefs.configuration.LINK_STYLE.AUTO=\u81EA\u52D5
 prefs.configuration.LINK_STYLE.BEZIER_CURVE=\u66F2\u7DDA
 prefs.configuration.LINK_STYLE.LINE=\u76F4\u7DDA\uFF08\u9AD8\u901F\uFF09
-DraggingInfosPopup.draggingEntry={0}\u30A8\u30F3\u30C8\u30EA\u3092\u30C9\u30E9\u30C3\u30B0\u3057\u3066\u3044\u307E\u3059\u3002
+DraggingInfosPopup.draggingEntry={0}\u30A8\u30F3\u30C8\u30EA\u30FC\u3092\u30C9\u30E9\u30C3\u30B0\u3057\u3066\u3044\u307E\u3059\u3002
 DraggingInfosPopup.dropInvalid=\n<< \u7121\u52B9\u306A\u30C9\u30ED\u30C3\u30D7 >>\n
-DraggingInfosPopup.draggingEntries={0}\u30A8\u30F3\u30C8\u30EA\u3092\u30C9\u30E9\u30C3\u30B0\u3057\u3066\u3044\u307E\u3059\u3002
+DraggingInfosPopup.draggingEntries={0}\u30A8\u30F3\u30C8\u30EA\u30FC\u3092\u30C9\u30E9\u30C3\u30B0\u3057\u3066\u3044\u307E\u3059\u3002
 DraggingInfosPopup.dropInvalidWithKey=\n<< \u7121\u52B9\u306A\u30C9\u30ED\u30C3\u30D7 >>\n\u4E00\u5BFE\u4E00\u30DE\u30C3\u30D4\u30F3\u30B0\u3057\u3001\u4E0A\u66F8\u304D\u3059\u308B\u5834\u5408\u306F\u3001Shift\u30AD\u30FC\u3068Ctrl\u30AD\u30FC\u3092\u540C\u6642\u306B\u62BC\u3057\u307E\u3059
 DraggingInfosPopup.overwriteMode= > \u4E0A\u66F8\u304D\u30E2\u30FC\u30C9
 DraggingInfosPopup.appendMode= > \u8FFD\u52A0\u30E2\u30FC\u30C9
 DraggingInfosPopup.appendModeToOverwrite= > \u8FFD\u52A0\u30E2\u30FC\u30C9(\u4E0A\u66F8\u304D\u3059\u308B\u306B\u306F[Ctrl]\u30AD\u30FC)
-DraggingInfosPopup.insertAllSelectedEntries= > \u9078\u629E\u3057\u305F\u3059\u3079\u3066\u306E\u30A8\u30F3\u30C8\u30EA\u3092\u633F\u5165\u3057\u307E\u3059
-DraggingInfosPopup.insertRemainingEntries= > \u6B8B\u308A\u306E\u30A8\u30F3\u30C8\u30EA\u3092\u633F\u5165\u3057\u307E\u3059
-DraggingInfosPopup.eachSourceEntryExpressionToEachTargetExpression=> \u5404\u30BF\u30FC\u30B2\u30C3\u30C8\u5F0F\u306B\u5BFE\u3059\u308B\u5404\u30BD\u30FC\u30B9\u30A8\u30F3\u30C8\u30EA\u5F0F
-DraggingInfosPopup.eachSourceEntryToEachTargetExpression=> \u5404\u30BF\u30FC\u30B2\u30C3\u30C8\u5F0F\u306B\u5BFE\u3059\u308B\u5404\u30BD\u30FC\u30B9\u30A8\u30F3\u30C8\u30EA
-DraggingInfosPopup.allSourceEntriesExpressionToASingleOneTargetExpressionShiftKey=> 1\u3064\u306E\u30BF\u30FC\u30B2\u30C3\u30C8\u5F0F\u306B\u5BFE\u3059\u308B\u3059\u3079\u3066\u306E\u30BD\u30FC\u30B9\u30A8\u30F3\u30C8\u30EA\u5F0F (\u30DE\u30C3\u30D4\u30F3\u30B0\u3092\u5909\u66F4\u3059\u308B\u306B\u306FShift\u30AD\u30FC)
-DraggingInfosPopup.allSourceEntriesExpressionToASingleOneTargetExpression=> 1\u3064\u306E\u30BF\u30FC\u30B2\u30C3\u30C8\u5F0F\u306B\u5BFE\u3059\u308B\u3059\u3079\u3066\u306E\u30BD\u30FC\u30B9\u30A8\u30F3\u30C8\u30EA\u5F0F
-DraggingInfosPopup.allSourceEntriesToASingleOneTargetExpressionShiftKey=> 1\u3064\u306E\u30BF\u30FC\u30B2\u30C3\u30C8\u5F0F\u306B\u5BFE\u3059\u308B\u3059\u3079\u3066\u306E\u30BD\u30FC\u30B9\u30A8\u30F3\u30C8\u30EA (\u30DE\u30C3\u30D4\u30F3\u30B0\u3092\u5909\u66F4\u3059\u308B\u306B\u306FShift\u30AD\u30FC)
-DraggingInfosPopup.allSourceEntriesToASingleOneTargetExpression=> 1\u3064\u306E\u30BF\u30FC\u30B2\u30C3\u30C8\u5F0F\u306B\u5BFE\u3059\u308B\u3059\u3079\u3066\u306E\u30BD\u30FC\u30B9\u30A8\u30F3\u30C8\u30EA
+DraggingInfosPopup.insertAllSelectedEntries= > \u9078\u629E\u3057\u305F\u3059\u3079\u3066\u306E\u30A8\u30F3\u30C8\u30EA\u30FC\u3092\u633F\u5165\u3057\u307E\u3059
+DraggingInfosPopup.insertRemainingEntries= > \u6B8B\u308A\u306E\u30A8\u30F3\u30C8\u30EA\u30FC\u3092\u633F\u5165\u3057\u307E\u3059
+DraggingInfosPopup.eachSourceEntryExpressionToEachTargetExpression=> \u5404\u30BF\u30FC\u30B2\u30C3\u30C8\u5F0F\u306B\u5BFE\u3059\u308B\u5404\u30BD\u30FC\u30B9\u30A8\u30F3\u30C8\u30EA\u30FC\u5F0F
+DraggingInfosPopup.eachSourceEntryToEachTargetExpression=> \u5404\u30BF\u30FC\u30B2\u30C3\u30C8\u5F0F\u306B\u5BFE\u3059\u308B\u5404\u30BD\u30FC\u30B9\u30A8\u30F3\u30C8\u30EA\u30FC
+DraggingInfosPopup.allSourceEntriesExpressionToASingleOneTargetExpressionShiftKey=> 1\u3064\u306E\u30BF\u30FC\u30B2\u30C3\u30C8\u5F0F\u306B\u5BFE\u3059\u308B\u3059\u3079\u3066\u306E\u30BD\u30FC\u30B9\u30A8\u30F3\u30C8\u30EA\u30FC\u5F0F (\u30DE\u30C3\u30D4\u30F3\u30B0\u3092\u5909\u66F4\u3059\u308B\u306B\u306FShift\u30AD\u30FC)
+DraggingInfosPopup.allSourceEntriesExpressionToASingleOneTargetExpression=> 1\u3064\u306E\u30BF\u30FC\u30B2\u30C3\u30C8\u5F0F\u306B\u5BFE\u3059\u308B\u3059\u3079\u3066\u306E\u30BD\u30FC\u30B9\u30A8\u30F3\u30C8\u30EA\u30FC\u5F0F
+DraggingInfosPopup.allSourceEntriesToASingleOneTargetExpressionShiftKey=> 1\u3064\u306E\u30BF\u30FC\u30B2\u30C3\u30C8\u5F0F\u306B\u5BFE\u3059\u308B\u3059\u3079\u3066\u306E\u30BD\u30FC\u30B9\u30A8\u30F3\u30C8\u30EA\u30FC (\u30DE\u30C3\u30D4\u30F3\u30B0\u3092\u5909\u66F4\u3059\u308B\u306B\u306FShift\u30AD\u30FC)
+DraggingInfosPopup.allSourceEntriesToASingleOneTargetExpression=> 1\u3064\u306E\u30BF\u30FC\u30B2\u30C3\u30C8\u5F0F\u306B\u5BFE\u3059\u308B\u3059\u3079\u3066\u306E\u30BD\u30FC\u30B9\u30A8\u30F3\u30C8\u30EA\u30FC
--- a/main/plugins/org.talend.designer.alfrescooutput/META-INF/MANIFEST.MF
+++ b/main/plugins/org.talend.designer.alfrescooutput/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Alfresco Output Component Plug-in
 Bundle-SymbolicName: org.talend.designer.alfrescooutput;singleton:=true
-Bundle-Version: 8.0.1.qualifier
+Bundle-Version: 8.8.8.qualifier
 Bundle-Vendor: .Talend SA.
 Require-Bundle: org.eclipse.core.runtime,
 org.talend.core,
--- a/main/plugins/org.talend.designer.alfrescooutput/pom.xml
+++ b/main/plugins/org.talend.designer.alfrescooutput/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
+    <version>8.8.8-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.designer.alfrescooutput</artifactId>
--- a/main/plugins/org.talend.designer.alfrescooutput/src/main/java/messages_ja.properties
+++ b/main/plugins/org.talend.designer.alfrescooutput/src/main/java/messages_ja.properties
@@ -4,7 +4,7 @@ AlfrescoOutputManager.schemaError.msg=\u6700\u521D\u306B\u30B9\u30AD\u30FC\u30DE
 AlfrescoOutputModelManager.alreadyAdded=\u3053\u306E\u30E2\u30C7\u30EB\u306F\u65E2\u306B\u8FFD\u52A0\u6E08\u307F\u3067\u3059\u3002
 AlfrescoOutputModelManager.errorReadingModel=Alfresco\u30E2\u30C7\u30EB\u30D5\u30A1\u30A4\u30EB\u306E\u8AAD\u8FBC\u307F\u30A8\u30E9\u30FC
 AlfrescoOutputModelManager.notYetAdded=\u3053\u306E\u30E2\u30C7\u30EB\u306F\u307E\u3060\u8FFD\u52A0\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-AlfrescoOutputModelManager.prefixConflict=\u5148\u306B\u8FFD\u52A0\u3055\u308C\u305F\u30E2\u30C7\u30EB\u306E\u30D7\u30EC\u30D5\u30A3\u30C3\u30AF\u30B9\u306E\u885D\u7A81\u306E\u305F\u3081\u3001\u30E2\u30C7\u30EB\u306E\u8FFD\u52A0\u304C\u51FA\u6765\u307E\u305B\u3093\u3002
+AlfrescoOutputModelManager.prefixConflict=\u5148\u306B\u8FFD\u52A0\u3055\u308C\u305F\u30E2\u30C7\u30EB\u306E\u30D7\u30EC\u30D5\u30A3\u30C3\u30AF\u30B9\u306E\u885D\u7A81\u306E\u305F\u3081\u3001\u30E2\u30C7\u30EB\u306E\u8FFD\u52A0\u304C\u3067\u304D\u307E\u305B\u3093\u3002
 AlfrescoModelDialog.type=\u30BF\u30A4\u30D7
 AlfrescoModelDialog.aspects=\u30A2\u30B9\u30DA\u30AF\u30C8
 AlfrescoModelDialog.availableAspects=\u53EF\u80FD\u306A\u30A2\u30B9\u30DA\u30AF\u30C8
--- a/main/plugins/org.talend.designer.codegen/META-INF/MANIFEST.MF
+++ b/main/plugins/org.talend.designer.codegen/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CodeGen Plug-in
 Bundle-SymbolicName: org.talend.designer.codegen;singleton:=true
-Bundle-Version: 8.0.1.qualifier
+Bundle-Version: 8.8.8.qualifier
 Bundle-Localization: plugin
 Require-Bundle: org.talend.core.repository,
 org.eclipse.emf.codegen,
--- a/main/plugins/org.talend.designer.codegen/jet_stub/component_part_footer.javajet
+++ b/main/plugins/org.talend.designer.codegen/jet_stub/component_part_footer.javajet
@@ -90,17 +90,14 @@ if((codePart.equals(ECodePart.END))&&(stat || logstashCurrent)){
 		  		INode source = con.getSource();
 				String sourceNodeId = source.getUniqueName();
 				
-				String sourceLabel = ElementParameterParser.getValue(source, "__LABEL__");
-				String sourceNodeLabel = ((sourceLabel==null || "__UNIQUE_NAME__".equals(sourceLabel) || sourceLabel.contains("\"")) ? sourceNodeId : sourceLabel.trim());
-				
-				String targetLabel = ElementParameterParser.getValue(node, "__LABEL__");
-				String targetNodeLabel = ((targetLabel==null || "__UNIQUE_NAME__".equals(targetLabel) || targetLabel.contains("\"")) ? node.getUniqueName() : targetLabel.trim());
+				String sourceNodeLabel = NodeUtil.getLabel(source);
+				String targetNodeLabel = NodeUtil.getLabel(node);
 				
 				String sourceNodeComponent = source.getComponent().getName();
 	 			for (INode jobStructureCatcher : jobCatcherNodes) {
 	 			%>
 			 		if(runStat.updateStatAndLog(execStat,enableLogStash,resourceMap,iterateId,"<%=con.getUniqueName()%>",2,0,
-			 			"<%=sourceNodeId%>","<%=sourceNodeLabel%>","<%=sourceNodeComponent%>","<%=node.getUniqueName()%>","<%=targetNodeLabel%>","<%=node.getComponent().getName()%>","<%="REJECT".equals(con.getConnectorName()) ? "reject" : "output"%>")) {
+			 			"<%=sourceNodeId%>",<%=sourceNodeLabel%>,"<%=sourceNodeComponent%>","<%=node.getUniqueName()%>",<%=targetNodeLabel%>,"<%=node.getComponent().getName()%>","<%="REJECT".equals(con.getConnectorName()) ? "reject" : "output"%>")) {
 						<%=jobStructureCatcher.getDesignSubjobStartNode().getUniqueName() %>Process(globalMap);
 					}
 				<%
@@ -124,17 +121,14 @@ if((codePart.equals(ECodePart.END))&&(stat || logstashCurrent)){
 			  		INode source = con.getSource();
 					String sourceNodeId = source.getUniqueName();
 					
-					String sourceLabel = ElementParameterParser.getValue(source, "__LABEL__");
-					String sourceNodeLabel = ((sourceLabel==null || "__UNIQUE_NAME__".equals(sourceLabel) || sourceLabel.contains("\"")) ? sourceNodeId : sourceLabel.trim());
-					
-					String targetLabel = ElementParameterParser.getValue(node, "__LABEL__");
-					String targetNodeLabel = ((targetLabel==null || "__UNIQUE_NAME__".equals(targetLabel) || targetLabel.contains("\"")) ? node.getUniqueName() : targetLabel.trim());
+					String sourceNodeLabel = NodeUtil.getLabel(source);
+					String targetNodeLabel = NodeUtil.getLabel(node);
 					
 					String sourceNodeComponent = source.getComponent().getName();
 		 			for (INode jobStructureCatcher : jobCatcherNodes) {
 		 			%>
 				 		if(runStat.log(resourceMap,iterateId,"<%=con.getUniqueName()%>",2,0,
-				 			"<%=sourceNodeId%>","<%=sourceNodeLabel%>","<%=sourceNodeComponent%>","<%=node.getUniqueName()%>","<%=targetNodeLabel%>","<%=node.getComponent().getName()%>","<%="REJECT".equals(con.getConnectorName()) ? "reject" : "output"%>")) {
+				 			"<%=sourceNodeId%>",<%=sourceNodeLabel%>,"<%=sourceNodeComponent%>","<%=node.getUniqueName()%>",<%=targetNodeLabel%>,"<%=node.getComponent().getName()%>","<%="REJECT".equals(con.getConnectorName()) ? "reject" : "output"%>")) {
 							<%=jobStructureCatcher.getDesignSubjobStartNode().getUniqueName() %>Process(globalMap);
 						}
 					<%
--- a/main/plugins/org.talend.designer.codegen/jet_stub/component_part_header.javajet
+++ b/main/plugins/org.talend.designer.codegen/jet_stub/component_part_header.javajet
@@ -196,15 +196,12 @@
 					INode source = con.getSource();
 					String sourceNodeId = source.getUniqueName();
 					
-					String sourceLabel = ElementParameterParser.getValue(source, "__LABEL__");
-					String sourceNodeLabel = ((sourceLabel==null || "__UNIQUE_NAME__".equals(sourceLabel) || sourceLabel.contains("\"")) ? sourceNodeId : sourceLabel.trim());
-					
-					String targetLabel = ElementParameterParser.getValue(node, "__LABEL__");
-					String targetNodeLabel = ((targetLabel==null || "__UNIQUE_NAME__".equals(targetLabel) || targetLabel.contains("\"")) ? node.getUniqueName() : targetLabel.trim());
+					String sourceNodeLabel = NodeUtil.getLabel(source);
+					String targetNodeLabel = NodeUtil.getLabel(node);
 					
 					String sourceNodeComponent = source.getComponent().getName();
 				%>
-					,"<%=con.getUniqueName()%>","<%=sourceNodeId%>","<%=sourceNodeLabel%>","<%=sourceNodeComponent%>","<%=node.getUniqueName()%>","<%=targetNodeLabel%>","<%=node.getComponent().getName()%>"
+					,"<%=con.getUniqueName()%>","<%=sourceNodeId%>",<%=sourceNodeLabel%>,"<%=sourceNodeComponent%>","<%=node.getUniqueName()%>",<%=targetNodeLabel%>,"<%=node.getComponent().getName()%>"
 				<%}%>
 			)) {
 				<%=subprocessName4Catcher %>Process(globalMap);
@@ -232,15 +229,12 @@
 							INode source = con.getSource();
 							String sourceNodeId = source.getUniqueName();
 							
-							String sourceLabel = ElementParameterParser.getValue(source, "__LABEL__");
-							String sourceNodeLabel = ((sourceLabel==null || "__UNIQUE_NAME__".equals(sourceLabel) || sourceLabel.contains("\"")) ? sourceNodeId : sourceLabel.trim());
-							
-							String targetLabel = ElementParameterParser.getValue(node, "__LABEL__");
-							String targetNodeLabel = ((targetLabel==null || "__UNIQUE_NAME__".equals(targetLabel) || targetLabel.contains("\"")) ? node.getUniqueName() : targetLabel.trim());
+							String sourceNodeLabel = NodeUtil.getLabel(source);
+							String targetNodeLabel = NodeUtil.getLabel(node);
 							
 							String sourceNodeComponent = source.getComponent().getName();
 						%>
-							,"<%=con.getUniqueName()%>","<%=sourceNodeId%>","<%=sourceNodeLabel%>","<%=sourceNodeComponent%>","<%=node.getUniqueName()%>","<%=targetNodeLabel%>","<%=node.getComponent().getName()%>"
+							,"<%=con.getUniqueName()%>","<%=sourceNodeId%>",<%=sourceNodeLabel%>,"<%=sourceNodeComponent%>","<%=node.getUniqueName()%>",<%=targetNodeLabel%>,"<%=node.getComponent().getName()%>"
 						<%}%>
 						)) {
 							<%=subprocessName4Catcher %>Process(globalMap);
@@ -259,16 +253,13 @@
 							INode source = con.getSource();
 							String sourceNodeId = source.getUniqueName();
 							
-							String sourceLabel = ElementParameterParser.getValue(source, "__LABEL__");
-							String sourceNodeLabel = ((sourceLabel==null || "__UNIQUE_NAME__".equals(sourceLabel) || sourceLabel.contains("\"")) ? sourceNodeId : sourceLabel.trim());
-							
-							String targetLabel = ElementParameterParser.getValue(node, "__LABEL__");
-							String targetNodeLabel = ((targetLabel==null || "__UNIQUE_NAME__".equals(targetLabel) || targetLabel.contains("\"")) ? node.getUniqueName() : targetLabel.trim());
+							String sourceNodeLabel = NodeUtil.getLabel(source);
+							String targetNodeLabel = NodeUtil.getLabel(node);
 							
 							String sourceNodeComponent = source.getComponent().getName();
 							
 							if(con.getUniqueName().equals((String)codeGenArgument.getIncomingName())){%>
-							,"<%=con.getUniqueName()%>","<%=sourceNodeId%>","<%=sourceNodeLabel%>","<%=sourceNodeComponent%>","<%=node.getUniqueName()%>","<%=targetNodeLabel%>","<%=node.getComponent().getName()%>"
+							,"<%=con.getUniqueName()%>","<%=sourceNodeId%>",<%=sourceNodeLabel%>,"<%=sourceNodeComponent%>","<%=node.getUniqueName()%>",<%=targetNodeLabel%>,"<%=node.getComponent().getName()%>"
 							<%}
 						}%>
 					)) {
@@ -295,16 +286,13 @@
 									INode source = con.getSource();
 									String sourceNodeId = source.getUniqueName();
 									
-									String sourceLabel = ElementParameterParser.getValue(source, "__LABEL__");
-									String sourceNodeLabel = ((sourceLabel==null || "__UNIQUE_NAME__".equals(sourceLabel) || sourceLabel.contains("\"")) ? sourceNodeId : sourceLabel.trim());
-									
-									String targetLabel = ElementParameterParser.getValue(node, "__LABEL__");
-									String targetNodeLabel = ((targetLabel==null || "__UNIQUE_NAME__".equals(targetLabel) || targetLabel.contains("\"")) ? node.getUniqueName() : targetLabel.trim());
+									String sourceNodeLabel = NodeUtil.getLabel(source);
+									String targetNodeLabel = NodeUtil.getLabel(node);
 							
 									String sourceNodeComponent = source.getComponent().getName();
 							
 									if(con.getUniqueName().equals((String)codeGenArgument.getIncomingName())){%>
-									,"<%=con.getUniqueName()%>","<%=sourceNodeId%>","<%=sourceNodeLabel%>","<%=sourceNodeComponent%>","<%=node.getUniqueName()%>","<%=targetNodeLabel%>","<%=node.getComponent().getName()%>"
+									,"<%=con.getUniqueName()%>","<%=sourceNodeId%>",<%=sourceNodeLabel%>,"<%=sourceNodeComponent%>","<%=node.getUniqueName()%>",<%=targetNodeLabel%>,"<%=node.getComponent().getName()%>"
 									<%}
 								}%>
 							)) {
@@ -434,11 +422,10 @@
 		
 		if(logstashCurrent) {
 			for (INode jobStructureCatcher : jobCatcherNodes) {
-				String label = ElementParameterParser.getValue(node, "__LABEL__");
-				String nodeLabel = ((label==null || "__UNIQUE_NAME__".equals(label) || label.contains("\"")) ? node.getUniqueName() : label.trim());
+				String nodeLabel = NodeUtil.getLabel(node);
 			%>
 			if(enableLogStash) {
-				<%=jobStructureCatcher.getUniqueName() %>.addCM("<%=node.getUniqueName()%>", "<%=nodeLabel%>", "<%=node.getComponent().getName()%>");
+				<%=jobStructureCatcher.getUniqueName() %>.addCM("<%=node.getUniqueName()%>", <%=nodeLabel%>, "<%=node.getComponent().getName()%>");
 				<%=jobStructureCatcher.getDesignSubjobStartNode().getUniqueName() %>Process(globalMap);
 			}
 			<%
--- a/main/plugins/org.talend.designer.codegen/pom.xml
+++ b/main/plugins/org.talend.designer.codegen/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
+    <version>8.8.8-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.designer.codegen</artifactId>
--- a/main/plugins/org.talend.designer.codegen/src/main/java/messages_ja.properties
+++ b/main/plugins/org.talend.designer.codegen/src/main/java/messages_ja.properties
@@ -48,7 +48,7 @@ ComponentsFactory.componentNotFound=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u
 ComponentsFactory.load.components=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u3092\u30ED\u30FC\u30C9...
 ComponentsFactory.parentNotRecompiled=\u8B66\u544A: *.inc.javajet\u306E\u89AA\u306F\u518D\u30B3\u30F3\u30D1\u30A4\u30EB\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
 ComponentsFactory.loadComponents.missingFolder=\u30D7\u30E9\u30B0\u30A4\u30F3"{1}"\u306B\u30D5\u30A9\u30EB\u30C0\u30FC"{0}"\u304C\u3042\u308A\u307E\u305B\u3093\u3002
-ComponentsFactory.init.waitForFinish.timeout=ComponentsFactory\u3092\u521D\u671F\u5316\u3067\u304D\u307E\u305B\u3093\u3002\u3082\u3046\u4E00\u5EA6\u8A66\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+ComponentsFactory.init.waitForFinish.timeout=ComponentsFactory\u3092\u521D\u671F\u5316\u3067\u304D\u307E\u305B\u3093\u3002\u3084\u308A\u76F4\u3057\u3066\u307F\u3066\u304F\u3060\u3055\u3044\u3002
 ComponentsLocalProviderService.componentLoadError=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u30ED\u30FC\u30C9\u30A8\u30E9\u30FC
 ComponentsLocalProviderService.talendExchangeError=Talend Exchange \u30A8\u30E9\u30FC
 ComponentsPreferencePage.ButtonLabel0=OK
--- a/main/plugins/org.talend.designer.components.exchange/META-INF/MANIFEST.MF
+++ b/main/plugins/org.talend.designer.components.exchange/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Exchange Plug-in
 Bundle-SymbolicName: org.talend.designer.components.exchange;singleton:=true
-Bundle-Version: 8.0.1.qualifier
+Bundle-Version: 8.8.8.qualifier
 Bundle-Activator: org.talend.designer.components.exchange.ExchangePlugin
 Require-Bundle: org.eclipse.core.runtime,
 org.eclipse.ui,
--- a/main/plugins/org.talend.designer.components.exchange/pom.xml
+++ b/main/plugins/org.talend.designer.components.exchange/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
+    <version>8.8.8-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.designer.components.exchange</artifactId>
--- a/main/plugins/org.talend.designer.components.exchange/src/main/java/messages_ja.properties
+++ b/main/plugins/org.talend.designer.components.exchange/src/main/java/messages_ja.properties
@@ -56,7 +56,7 @@ ShowInstalledExtensionsJob.ShowInstalledExtensions.Title=extensions\u3092\u30A4\
 ShowInstalledExtensionsJob.ShowInstalledExtensions.Message=exchange\u304B\u3089extensions\u3092\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u2026
 DeleteExtensionJob.DeleteExtensionJob.Title=Extension\u3092\u524A\u9664\u3057\u307E\u3059\u2026
 DeleteExtensionJob.DeleteExtensionJob.Message=Extension\u3092\u524A\u9664\u3057\u307E\u3059\u2026
-DeleteExtensionJob.DeleteFailure=\u524A\u9664\u51FA\u6765\u307E\u305B\u3093
+DeleteExtensionJob.DeleteFailure=\u524A\u9664\u3067\u304D\u307E\u305B\u3093
 DeleteExtensionJob.DeleteFailureTip=\u30C1\u30A7\u30C3\u30AF\u3092\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 ModifyExtensionJob.Title=Extension\u3092\u4FEE\u6B63\u2026
 ModifyExtensionJob.Message=Extension\u3092\u4FEE\u6B63\u2026
--- a/main/plugins/org.talend.designer.components.libs/META-INF/MANIFEST.MF
+++ b/main/plugins/org.talend.designer.components.libs/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Components Libs Plug-in
 Bundle-SymbolicName: org.talend.designer.components.libs
-Bundle-Version: 8.0.1.qualifier
+Bundle-Version: 8.8.8.qualifier
 Require-Bundle: org.eclipse.core.runtime
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: .Talend SA.
--- a/main/plugins/org.talend.designer.components.libs/libs_src/CouchDBUtil/pom.xml
+++ b/main/plugins/org.talend.designer.components.libs/libs_src/CouchDBUtil/pom.xml
@@ -8,6 +8,14 @@
  <version>1.0.0</version>
  <packaging>jar</packaging>

+  <licenses>
+    <license>
+      <name>Apache License, Version 2.0</name>
+      <url>https://www.talendforge.org/modules/licenses/APACHE_v2.txt</url>
+      <distribution>may be downloaded from the Maven repository</distribution>
+    </license>
+  </licenses>
+
  <properties>
    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
    <talend.nexus.url>https://artifacts-oss.talend.com</talend.nexus.url>
--- a/main/plugins/org.talend.designer.components.libs/libs_src/NetSuite_Management/pom.xml
+++ b/main/plugins/org.talend.designer.components.libs/libs_src/NetSuite_Management/pom.xml
@@ -6,6 +6,14 @@
 	<name>NetSuite_Management</name>
 	<version>1.0.3</version>

+	<licenses>
+		<license>
+			<name>Apache License, Version 2.0</name>
+			<url>https://www.talendforge.org/modules/licenses/APACHE_v2.txt</url>
+			<distribution>may be downloaded from the Maven repository</distribution>
+		</license>
+	</licenses>
+
 	<dependencies>
 	<dependency>
 		<groupId>org.talend</groupId>
--- a/main/plugins/org.talend.designer.components.libs/libs_src/Netsuite_Client/pom.xml
+++ b/main/plugins/org.talend.designer.components.libs/libs_src/Netsuite_Client/pom.xml
@@ -6,6 +6,14 @@
 	<name>Netsuite_Client</name>
 	<version>1.0.0</version>

+	<licenses>
+		<license>
+			<name>Apache License, Version 2.0</name>
+			<url>https://www.talendforge.org/modules/licenses/APACHE_v2.txt</url>
+			<distribution>may be downloaded from the Maven repository</distribution>
+		</license>
+	</licenses>
+
 	<dependencies>
 	</dependencies>

--- a/main/plugins/org.talend.designer.components.libs/libs_src/TalendSAX/pom.xml
+++ b/main/plugins/org.talend.designer.components.libs/libs_src/TalendSAX/pom.xml
@@ -7,6 +7,15 @@
 	<version>1.0.1-20190326</version>
 	<packaging>jar</packaging>

+
+	<licenses>
+		<license>
+			<name>Apache License, Version 2.0</name>
+			<url>https://www.talendforge.org/modules/licenses/APACHE_v2.txt</url>
+			<distribution>may be downloaded from the Maven repository</distribution>
+		</license>
+	</licenses>
+
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<talend.nexus.url>https://artifacts-oss.talend.com</talend.nexus.url>
--- a/main/plugins/org.talend.designer.components.libs/libs_src/adal4j/pom.xml
+++ b/main/plugins/org.talend.designer.components.libs/libs_src/adal4j/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.microsoft.azure</groupId>
 	<artifactId>adal4j</artifactId>
-	<version>1.6.4-20210713</version>
+	<version>1.6.4-20211021</version>
 	<packaging>jar</packaging>
 	<name>adal4j</name>
 	<description>
@@ -94,7 +94,7 @@
 		<dependency>
 			<groupId>com.nimbusds</groupId>
 			<artifactId>oauth2-oidc-sdk</artifactId>
-			<version>6.5</version>
+			<version>9.7</version>
 		</dependency>
 		<dependency>
 			<groupId>com.nimbusds</groupId>
--- a/main/plugins/org.talend.designer.components.libs/libs_src/adal4j/src/main/java/com/microsoft/aad/adal4j/AdalOAuthRequest.java
+++ b/main/plugins/org.talend.designer.components.libs/libs_src/adal4j/src/main/java/com/microsoft/aad/adal4j/AdalOAuthRequest.java
@@ -40,7 +40,6 @@ import java.util.Collections;
 import java.util.Map;

 import com.nimbusds.oauth2.sdk.ParseException;
-import com.nimbusds.oauth2.sdk.http.CommonContentTypes;
 import com.nimbusds.oauth2.sdk.http.HTTPRequest;
 import com.nimbusds.oauth2.sdk.http.HTTPResponse;
 import org.slf4j.Logger;
@@ -138,7 +137,7 @@ class AdalOAuthRequest extends HTTPRequest {
        HttpHelper.configureAdditionalHeaders(conn, params);
        conn.setDoOutput(true);
        conn.setRequestProperty("Content-Type",
-                CommonContentTypes.APPLICATION_URLENCODED.toString());
+                HTTPContentType.ApplicationURLEncoded.contentType);

        if (this.getQuery() != null) {
            try(final OutputStreamWriter writer = new OutputStreamWriter(
--- a/main/plugins/org.talend.designer.components.libs/libs_src/adal4j/src/main/java/com/microsoft/aad/adal4j/AdalTokenRequest.java
+++ b/main/plugins/org.talend.designer.components.libs/libs_src/adal4j/src/main/java/com/microsoft/aad/adal4j/AdalTokenRequest.java
@@ -37,7 +37,6 @@ import com.nimbusds.oauth2.sdk.ParseException;
 import com.nimbusds.oauth2.sdk.SerializeException;
 import com.nimbusds.oauth2.sdk.TokenErrorResponse;
 import com.nimbusds.oauth2.sdk.auth.ClientAuthentication;
-import com.nimbusds.oauth2.sdk.http.CommonContentTypes;
 import com.nimbusds.oauth2.sdk.http.HTTPRequest;
 import com.nimbusds.oauth2.sdk.http.HTTPResponse;
 import com.nimbusds.oauth2.sdk.util.URLUtils;
@@ -146,7 +145,7 @@ class AdalTokenRequest {
     * @return
     * @throws SerializeException
     */
-    AdalOAuthRequest toOAuthRequest() throws SerializeException {
+    AdalOAuthRequest toOAuthRequest() throws SerializeException, ParseException {

        if (this.uri == null) {
            throw new SerializeException("The endpoint URI is not specified");
@@ -155,7 +154,7 @@ class AdalTokenRequest {
        final AdalOAuthRequest httpRequest = new AdalOAuthRequest(
                HTTPRequest.Method.POST, this.uri, headerMap, this.proxy,
                this.sslSocketFactory);
-        httpRequest.setContentType(CommonContentTypes.APPLICATION_URLENCODED);
+        httpRequest.setContentType(HTTPContentType.ApplicationURLEncoded.contentType);
        final Map<String, List<String>> params = this.grant.toParameters();
        httpRequest.setQuery(URLUtils.serializeParameters(params));
        if (this.clientAuth != null) {
--- a/main/plugins/org.talend.designer.components.libs/libs_src/adal4j/src/main/java/com/microsoft/aad/adal4j/ClientAuthenticationPost.java
+++ b/main/plugins/org.talend.designer.components.libs/libs_src/adal4j/src/main/java/com/microsoft/aad/adal4j/ClientAuthenticationPost.java
@@ -28,12 +28,9 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

-import javax.mail.internet.ContentType;
-
 import com.nimbusds.oauth2.sdk.SerializeException;
 import com.nimbusds.oauth2.sdk.auth.ClientAuthentication;
 import com.nimbusds.oauth2.sdk.auth.ClientAuthenticationMethod;
-import com.nimbusds.oauth2.sdk.http.CommonContentTypes;
 import com.nimbusds.oauth2.sdk.http.HTTPRequest;
 import com.nimbusds.oauth2.sdk.id.ClientID;
 import com.nimbusds.oauth2.sdk.util.URLUtils;
@@ -60,15 +57,15 @@ class ClientAuthenticationPost extends ClientAuthentication {
        if (httpRequest.getMethod() != HTTPRequest.Method.POST)
            throw new SerializeException("The HTTP request method must be POST");

-        ContentType ct = httpRequest.getContentType();
+        String ct = String.valueOf(httpRequest.getEntityContentType());

        if (ct == null)
            throw new SerializeException("Missing HTTP Content-Type header");

-        if (!ct.match(CommonContentTypes.APPLICATION_URLENCODED))
+        if (!ct.equals(HTTPContentType.ApplicationURLEncoded.contentType))
            throw new SerializeException(
                    "The HTTP Content-Type header must be "
-                            + CommonContentTypes.APPLICATION_URLENCODED);
+                            + HTTPContentType.ApplicationURLEncoded.contentType);

        Map<String, List<String>> params = httpRequest.getQueryParameters();

--- a/main/plugins/org.talend.designer.components.libs/libs_src/adal4j/src/main/java/com/microsoft/aad/adal4j/HTTPContentType.java
+++ b/main/plugins/org.talend.designer.components.libs/libs_src/adal4j/src/main/java/com/microsoft/aad/adal4j/HTTPContentType.java
@@ -0,0 +1,19 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.microsoft.aad.adal4j;
+
+/**
+ * Enum containing HTTP Content-Type header values
+ */
+enum HTTPContentType {
+
+    ApplicationURLEncoded("application/x-www-form-urlencoded; charset=UTF-8"),
+    ApplicationJSON("application/json; charset=UTF-8");
+
+    public final String contentType;
+
+    HTTPContentType(String contentType) {
+        this.contentType = contentType;
+    }
+}
--- a/main/plugins/org.talend.designer.components.libs/libs_src/adal4j/src/test/java/com/microsoft/aad/adal4j/AdalOAuthRequestTest.java
+++ b/main/plugins/org.talend.designer.components.libs/libs_src/adal4j/src/test/java/com/microsoft/aad/adal4j/AdalOAuthRequestTest.java
@@ -52,8 +52,8 @@ public class AdalOAuthRequestTest extends AbstractAdalTests {
        assertNotNull(request);
    }

-
-    @Test(expectedExceptions = IOException.class, expectedExceptionsMessageRegExp = "Couldn't parse Content-Type header: Invalid Content-Type value: In Content-Type string <invalid-content>, expected '/', got null")
+    @Test(expectedExceptions = IOException.class, expectedExceptionsMessageRegExp =
+            "Couldn't parse Content-Type header: Invalid Content-Type value: Invalid content type string")
    public void testCreateResponseContentTypeParsingFailure()
            throws Exception {

--- a/main/plugins/org.talend.designer.components.libs/libs_src/adal4j/src/test/java/com/microsoft/aad/adal4j/AdalTokenRequestTest.java
+++ b/main/plugins/org.talend.designer.components.libs/libs_src/adal4j/src/test/java/com/microsoft/aad/adal4j/AdalTokenRequestTest.java
@@ -33,7 +33,6 @@ import com.nimbusds.oauth2.sdk.*;
 import com.nimbusds.oauth2.sdk.auth.ClientAuthentication;
 import com.nimbusds.oauth2.sdk.auth.ClientSecretPost;
 import com.nimbusds.oauth2.sdk.auth.Secret;
-import com.nimbusds.oauth2.sdk.http.CommonContentTypes;
 import com.nimbusds.oauth2.sdk.http.HTTPResponse;
 import com.nimbusds.oauth2.sdk.id.ClientID;
 import com.nimbusds.oauth2.sdk.util.JSONObjectUtils;
@@ -77,7 +76,7 @@ public class AdalTokenRequestTest extends AbstractAdalTests {
                "\"correlation_id\":\"3a...95a\"," +
                "\"claims\":\"" + claims + "\"}";
        httpResponse.setContent(content);
-        httpResponse.setContentType(CommonContentTypes.APPLICATION_JSON);
+        httpResponse.setContentType(HTTPContentType.ApplicationJSON.contentType);

        EasyMock.expect(request.toOAuthRequest()).andReturn(adalOAuthHttpRequest).times(1);
        EasyMock.expect(adalOAuthHttpRequest.send()).andReturn(httpResponse).times(1);
@@ -131,7 +130,7 @@ public class AdalTokenRequestTest extends AbstractAdalTests {
    @Test
    public void testToOAuthRequestNonEmptyCorrelationId()
            throws MalformedURLException, SerializeException,
-            URISyntaxException {
+            URISyntaxException, ParseException {
        final ClientAuthentication ca = new ClientSecretPost(
                new ClientID("id"), new Secret("secret"));
        final AuthorizationGrant ag = new AuthorizationCodeGrant(
@@ -155,7 +154,7 @@ public class AdalTokenRequestTest extends AbstractAdalTests {
    @Test
    public void testToOAuthRequestNullCorrelationId_NullClientAuth()
            throws MalformedURLException, SerializeException,
-            URISyntaxException {
+            URISyntaxException, ParseException {
        final AuthorizationGrant ag = new AuthorizationCodeGrant(
                new AuthorizationCode("code"),
                new URI("http://my.redirect.com"));
--- a/main/plugins/org.talend.designer.components.libs/libs_src/adal4j/src/test/java/com/microsoft/aad/adal4j/DeviceCodeFlowTest.java
+++ b/main/plugins/org.talend.designer.components.libs/libs_src/adal4j/src/test/java/com/microsoft/aad/adal4j/DeviceCodeFlowTest.java
@@ -33,7 +33,6 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.Future;

 import com.nimbusds.oauth2.sdk.auth.ClientAuthentication;
-import com.nimbusds.oauth2.sdk.http.CommonContentTypes;
 import com.nimbusds.oauth2.sdk.http.HTTPResponse;
 import org.easymock.Capture;
 import org.easymock.EasyMock;
@@ -196,7 +195,7 @@ public class DeviceCodeFlowTest {
                "\"correlation_id\":\"ff60101b-cb23-4a52-82cb-9966f466327a\"}";

        httpResponse.setContent(content);
-        httpResponse.setContentType(CommonContentTypes.APPLICATION_JSON);
+        httpResponse.setContentType(HTTPContentType.ApplicationJSON.contentType);

        EasyMock.expect(request.toOAuthRequest()).andReturn(adalOAuthHttpRequest).times(1);
        EasyMock.expect(adalOAuthHttpRequest.send()).andReturn(httpResponse).times(1);
--- a/main/plugins/org.talend.designer.components.localprovider/components/tVtigerCRMInput/LICENSE.txt
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tVtigerCRMInput/LICENSE.txt
@@ -1,203 +1,202 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
- 
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
--- a/main/plugins/org.talend.designer.components.libs/libs_src/azure-utils/pom.xml
+++ b/main/plugins/org.talend.designer.components.libs/libs_src/azure-utils/pom.xml
@@ -6,7 +6,16 @@

    <groupId>org.talend.components.lib</groupId>
    <artifactId>azure-utils</artifactId>
-    <version>1.0.2</version>
+    <version>1.0.3</version>
+
+    <licenses>
+        <license>
+            <name>Apache License, Version 2.0</name>
+            <url>https://github.com/Talend/tdi-studio-se/blob/master/main/plugins/org.talend.designer.components.libs/libs_src/azure-utils/LICENSE</url>
+            <distribution>may be downloaded from the Maven repository</distribution>
+        </license>
+    </licenses>
+
    <build>
        <plugins>
            <plugin>
--- a/main/plugins/org.talend.designer.components.libs/libs_src/bonitaclient/pom.xml
+++ b/main/plugins/org.talend.designer.components.libs/libs_src/bonitaclient/pom.xml
@@ -6,6 +6,14 @@
 	<name>talend-bonita-client</name>
 	<version>1.0.1</version>

+	<licenses>
+		<license>
+			<name>Apache License, Version 2.0</name>
+			<url>https://www.talendforge.org/modules/licenses/APACHE_v2.txt</url>
+			<distribution>may be downloaded from the Maven repository</distribution>
+		</license>
+	</licenses>
+
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

--- a/main/plugins/org.talend.designer.components.libs/libs_src/checkArchive/pom.xml
+++ b/main/plugins/org.talend.designer.components.libs/libs_src/checkArchive/pom.xml
@@ -5,7 +5,15 @@
  <version>1.2-20210901</version>
  <name>checkArchive</name>
  <description>Dependence for tFileArchive and tFileUnAchive</description>
-<url>http://maven.apache.org</url>
+  <url>http://maven.apache.org</url>
+  
+	<licenses>
+		<license>
+			<name>Apache License, Version 2.0</name>
+			<url>https://www.talendforge.org/modules/licenses/APACHE_v2.txt</url>
+			<distribution>may be downloaded from the Maven repository</distribution>
+		</license>
+	</licenses>

 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
--- a/main/plugins/org.talend.designer.components.libs/libs_src/commons-net-ftps-proxy/pom.xml
+++ b/main/plugins/org.talend.designer.components.libs/libs_src/commons-net-ftps-proxy/pom.xml
@@ -7,6 +7,14 @@

    <name>commons-net-talend</name>

+    <licenses>
+        <license>
+            <name>Apache License, Version 2.0</name>
+            <url>https://www.talendforge.org/modules/licenses/APACHE_v2.txt</url>
+            <distribution>may be downloaded from the Maven repository</distribution>
+        </license>
+    </licenses>
+
    <properties>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <talend.nexus.url>https://artifacts-oss.talend.com</talend.nexus.url>
--- a/main/plugins/org.talend.designer.components.libs/libs_src/cyberark-wrapper/pom.xml
+++ b/main/plugins/org.talend.designer.components.libs/libs_src/cyberark-wrapper/pom.xml
@@ -7,6 +7,13 @@

    <name>Cyberark-wrapper</name>

+    <licenses>
+        <license>
+            <name>Apache License, Version 2.0</name>
+            <url>https://www.talendforge.org/modules/licenses/APACHE_v2.txt</url>
+            <distribution>may be downloaded from the Maven repository</distribution>
+        </license>
+    </licenses>

    <dependencies>
        <dependency>
--- a/main/plugins/org.talend.designer.components.libs/libs_src/filecopy/pom.xml
+++ b/main/plugins/org.talend.designer.components.libs/libs_src/filecopy/pom.xml
@@ -9,6 +9,15 @@

 	<name>talend-copy</name>

+	<licenses>
+		<license>
+			<name>Apache License, Version 2.0</name>
+			<url>https://www.talendforge.org/modules/licenses/APACHE_v2.txt</url>
+			<distribution>may be downloaded from the Maven repository</distribution>
+		</license>
+	</licenses>
+
+
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<talend.nexus.url>https://artifacts-oss.talend.com</talend.nexus.url>
--- a/main/plugins/org.talend.designer.components.libs/libs_src/marketo-soap-sdk/pom.xml
+++ b/main/plugins/org.talend.designer.components.libs/libs_src/marketo-soap-sdk/pom.xml
@@ -10,6 +10,14 @@
 	<name>Marketo SOAP API SDK</name>
 	<url>http://maven.apache.org</url>

+	<licenses>
+		<license>
+			<name>Apache License, Version 2.0</name>
+			<url>https://www.talendforge.org/modules/licenses/APACHE_v2.txt</url>
+			<distribution>may be downloaded from the Maven repository</distribution>
+		</license>
+	</licenses>
+
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<talend.nexus.url>https://artifacts-oss.talend.com</talend.nexus.url>
--- a/main/plugins/org.talend.designer.components.libs/libs_src/mqrfh2header/pom.xml
+++ b/main/plugins/org.talend.designer.components.libs/libs_src/mqrfh2header/pom.xml
@@ -7,6 +7,14 @@
 	<version>1.0.1-20190206</version>
 	<packaging>jar</packaging>

+	<licenses>
+		<license>
+			<name>Apache License, Version 2.0</name>
+			<url>https://www.talendforge.org/modules/licenses/APACHE_v2.txt</url>
+			<distribution>may be downloaded from the Maven repository</distribution>
+		</license>
+	</licenses>
+
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<talend.nexus.url>https://artifacts-oss.talend.com</talend.nexus.url>
--- a/main/plugins/org.talend.designer.components.libs/libs_src/paloIX3/pom.xml
+++ b/main/plugins/org.talend.designer.components.libs/libs_src/paloIX3/pom.xml
@@ -7,6 +7,14 @@
  <version>1.0.1</version>
  <packaging>jar</packaging>

+  <licenses>
+    <license>
+      <name>Apache License, Version 2.0</name>
+      <url>https://www.talendforge.org/modules/licenses/APACHE_v2.txt</url>
+      <distribution>may be downloaded from the Maven repository</distribution>
+    </license>
+  </licenses>
+
  <properties>
    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
    <talend.nexus.url>https://artifacts-oss.talend.com</talend.nexus.url>
--- a/main/plugins/org.talend.designer.components.libs/libs_src/simpleexcel/pom.xml
+++ b/main/plugins/org.talend.designer.components.libs/libs_src/simpleexcel/pom.xml
@@ -10,6 +10,14 @@
  <name>simpleexcel</name>
  <url>http://maven.apache.org</url>

+  <licenses>
+    <license>
+      <name>Apache License, Version 2.0</name>
+      <url>https://www.talendforge.org/modules/licenses/APACHE_v2.txt</url>
+      <distribution>may be downloaded from the Maven repository</distribution>
+    </license>
+  </licenses>
+
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<talend.nexus.url>https://artifacts-oss.talend.com</talend.nexus.url>
--- a/main/plugins/org.talend.designer.components.libs/libs_src/soap/pom.xml
+++ b/main/plugins/org.talend.designer.components.libs/libs_src/soap/pom.xml
@@ -8,6 +8,14 @@

 	<name>talend-soap</name>

+	<licenses>
+		<license>
+			<name>Apache License, Version 2.0</name>
+			<url>https://www.talendforge.org/modules/licenses/APACHE_v2.txt</url>
+			<distribution>may be downloaded from the Maven repository</distribution>
+		</license>
+	</licenses>
+
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<talend.nexus.url>https://artifacts-oss.talend.com</talend.nexus.url>
--- a/main/plugins/org.talend.designer.components.libs/libs_src/talend-aws/pom.xml
+++ b/main/plugins/org.talend.designer.components.libs/libs_src/talend-aws/pom.xml
@@ -9,6 +9,14 @@

 	<name>talend-aws</name>

+	<licenses>
+		<license>
+			<name>Apache License, Version 2.0</name>
+			<url>https://www.talendforge.org/modules/licenses/APACHE_v2.txt</url>
+			<distribution>may be downloaded from the Maven repository</distribution>
+		</license>
+	</licenses>
+
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<talend.nexus.url>https://artifacts-oss.talend.com</talend.nexus.url>
--- a/main/plugins/org.talend.designer.components.libs/libs_src/talend-codegen-utils/pom.xml
+++ b/main/plugins/org.talend.designer.components.libs/libs_src/talend-codegen-utils/pom.xml
@@ -9,7 +9,15 @@
 	<!-- release for revert version of library -->
 	<version>0.31.0</version>
 	<packaging>jar</packaging>
-	
+
+	<licenses>
+		<license>
+			<name>Apache License, Version 2.0</name>
+			<url>https://www.talendforge.org/modules/licenses/APACHE_v2.txt</url>
+			<distribution>may be downloaded from the Maven repository</distribution>
+		</license>
+	</licenses>
+
 	<properties>
 		<avro.version>1.8.0</avro.version>
 		<components.version>0.30.0</components.version>
--- a/main/plugins/org.talend.designer.components.libs/libs_src/talend-db-exasol-util/pom.xml
+++ b/main/plugins/org.talend.designer.components.libs/libs_src/talend-db-exasol-util/pom.xml
@@ -12,6 +12,14 @@

 	<name>talend-db-exasol</name>

+	<licenses>
+		<license>
+			<name>Apache License, Version 2.0</name>
+			<url>https://www.talendforge.org/modules/licenses/APACHE_v2.txt</url>
+			<distribution>may be downloaded from the Maven repository</distribution>
+		</license>
+	</licenses>
+
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<talend.nexus.url>https://artifacts-oss.talend.com</talend.nexus.url>
--- a/main/plugins/org.talend.designer.components.libs/libs_src/talend-httputil/pom.xml
+++ b/main/plugins/org.talend.designer.components.libs/libs_src/talend-httputil/pom.xml
@@ -6,6 +6,14 @@
 	<name>talend-httputil</name>
 	<version>1.0.6</version>

+	<licenses>
+		<license>
+			<name>Apache License, Version 2.0</name>
+			<url>https://www.talendforge.org/modules/licenses/APACHE_v2.txt</url>
+			<distribution>may be downloaded from the Maven repository</distribution>
+		</license>
+	</licenses>
+
 	<properties>
 		<talend.nexus.url>https://artifacts-oss.talend.com</talend.nexus.url>
 	</properties>
--- a/main/plugins/org.talend.designer.components.libs/libs_src/talend-job-monitoring/pom.xml
+++ b/main/plugins/org.talend.designer.components.libs/libs_src/talend-job-monitoring/pom.xml
@@ -8,6 +8,14 @@
 	<artifactId>job-audit</artifactId>
 	<version>1.4</version>

+	<licenses>
+		<license>
+			<name>Apache License, Version 2.0</name>
+			<url>https://www.talendforge.org/modules/licenses/APACHE_v2.txt</url>
+			<distribution>may be downloaded from the Maven repository</distribution>
+		</license>
+	</licenses>
+
 	<properties>
 		<talend.nexus.url>https://artifacts-oss.talend.com</talend.nexus.url>
 		<daikon.audit.version>1.16.1</daikon.audit.version>
@@ -69,13 +77,13 @@
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-api</artifactId>
-			<version>2.13.2</version>
+			<version>2.17.1</version>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-core</artifactId>
-			<version>2.13.2</version>
+			<version>2.17.1</version>
 			<optional>true</optional>
 		</dependency>
 	</dependencies>
@@ -97,4 +105,4 @@
 		</pluginManagement>
 	</build>

-</project>
+</project>
--- a/main/plugins/org.talend.designer.components.libs/libs_src/talend-mscrm/pom.xml
+++ b/main/plugins/org.talend.designer.components.libs/libs_src/talend-mscrm/pom.xml
@@ -3,11 +3,19 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.talend.components</groupId>
 	<artifactId>talend-mscrm</artifactId>
-	<version>3.9-20210713</version>
+	<version>3.10-20211021</version>
 	<packaging>jar</packaging>
-	
+
 	<name>talend-mscrm</name>
-	
+
+	<licenses>
+		<license>
+			<name>Apache License, Version 2.0</name>
+			<url>https://www.talendforge.org/modules/licenses/APACHE_v2.txt</url>
+			<distribution>may be downloaded from the Maven repository</distribution>
+		</license>
+	</licenses>
+
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<talend.nexus.url>https://artifacts-oss.talend.com</talend.nexus.url>
@@ -18,7 +26,7 @@
 		<httpclient.version>4.5.13</httpclient.version>
 		<httpcore.version>4.4.13</httpcore.version>
 		<junit.version>4.13.2</junit.version>
-		<adal4j.version>1.6.4-20210713</adal4j.version>
+		<adal4j.version>1.6.4-20211021</adal4j.version>
 		<jackson.version>2.11.4</jackson.version>

 		<!-- plugin's versions -->
--- a/main/plugins/org.talend.designer.components.libs/libs_src/talend-orc/pom.xml
+++ b/main/plugins/org.talend.designer.components.libs/libs_src/talend-orc/pom.xml
@@ -5,6 +5,15 @@
 	<groupId>org.talend.components</groupId>
 	<artifactId>talend-orc</artifactId>
 	<version>1.0-20211008</version>
+
+	<licenses>
+		<license>
+			<name>Apache License, Version 2.0</name>
+			<url>https://www.talendforge.org/modules/licenses/APACHE_v2.txt</url>
+			<distribution>may be downloaded from the Maven repository</distribution>
+		</license>
+	</licenses>
+
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<hadoop.version>3.2.2</hadoop.version>
--- a/main/plugins/org.talend.designer.components.libs/libs_src/talend-parquet/pom.xml
+++ b/main/plugins/org.talend.designer.components.libs/libs_src/talend-parquet/pom.xml
@@ -7,6 +7,14 @@
 	<artifactId>talend-parquet</artifactId>
 	<version>1.3</version>

+	<licenses>
+		<license>
+			<name>Apache License, Version 2.0</name>
+			<url>https://www.talendforge.org/modules/licenses/APACHE_v2.txt</url>
+			<distribution>may be downloaded from the Maven repository</distribution>
+		</license>
+	</licenses>
+
 	<properties>
 		<parquet.version>1.10.1</parquet.version>
 		<hadoop.version>3.2.2</hadoop.version>
--- a/main/plugins/org.talend.designer.components.libs/libs_src/talend-proxy/pom.xml
+++ b/main/plugins/org.talend.designer.components.libs/libs_src/talend-proxy/pom.xml
@@ -7,6 +7,15 @@
    <groupId>org.talend.components.lib</groupId>
    <artifactId>talend-proxy</artifactId>
    <version>1.0.2</version>
+
+    <licenses>
+        <license>
+            <name>Apache License, Version 2.0</name>
+            <url>https://www.talendforge.org/modules/licenses/APACHE_v2.txt</url>
+            <distribution>may be downloaded from the Maven repository</distribution>
+        </license>
+    </licenses>
+
    <build>
        <plugins>
            <plugin>
--- a/main/plugins/org.talend.designer.components.libs/libs_src/talend-sap/pom.xml
+++ b/main/plugins/org.talend.designer.components.libs/libs_src/talend-sap/pom.xml
@@ -4,4 +4,13 @@
  <artifactId>talend-sap</artifactId>
  <version>1.0.0</version>
  <name>talend-sap</name>
+
+  <licenses>
+    <license>
+      <name>Apache License, Version 2.0</name>
+      <url>https://www.talendforge.org/modules/licenses/APACHE_v2.txt</url>
+      <distribution>may be downloaded from the Maven repository</distribution>
+    </license>
+  </licenses>
+
 </project>
--- a/main/plugins/org.talend.designer.components.libs/libs_src/talend-scp-helper/pom.xml
+++ b/main/plugins/org.talend.designer.components.libs/libs_src/talend-scp-helper/pom.xml
@@ -8,6 +8,14 @@
    <artifactId>talend-scp-helper</artifactId>
    <version>1.0</version>

+    <licenses>
+        <license>
+            <name>Apache License, Version 2.0</name>
+            <url>https://www.talendforge.org/modules/licenses/APACHE_v2.txt</url>
+            <distribution>may be downloaded from the Maven repository</distribution>
+        </license>
+    </licenses>
+
    <properties>
        <maven.compiler.source>8</maven.compiler.source>
        <maven.compiler.target>8</maven.compiler.target>
--- a/main/plugins/org.talend.designer.components.libs/libs_src/talend-ucanaccess-utils/pom.xml
+++ b/main/plugins/org.talend.designer.components.libs/libs_src/talend-ucanaccess-utils/pom.xml
@@ -5,7 +5,15 @@
 	<artifactId>talend-ucanaccess-utils</artifactId>
 	<name>talend-ucanaccess-utils</name>
 	<version>1.0.0</version>
-	
+
+	<licenses>
+		<license>
+			<name>Apache License, Version 2.0</name>
+			<url>https://www.talendforge.org/modules/licenses/APACHE_v2.txt</url>
+			<distribution>may be downloaded from the Maven repository</distribution>
+		</license>
+	</licenses>
+
 	<properties>
 		<talend.nexus.url>https://artifacts-oss.talend.com</talend.nexus.url>
 	</properties>
--- a/main/plugins/org.talend.designer.components.libs/libs_src/talend-webservice-input/pom.xml
+++ b/main/plugins/org.talend.designer.components.libs/libs_src/talend-webservice-input/pom.xml
@@ -9,6 +9,14 @@

  <name>talend-webservice-input</name>

+  <licenses>
+    <license>
+      <name>Apache License, Version 2.0</name>
+      <url>https://www.talendforge.org/modules/licenses/APACHE_v2.txt</url>
+      <distribution>may be downloaded from the Maven repository</distribution>
+    </license>
+  </licenses>
+
  <properties>
    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
    <talend.nexus.url>https://artifacts-oss.talend.com</talend.nexus.url>
--- a/main/plugins/org.talend.designer.components.libs/libs_src/talend-ws/pom.xml
+++ b/main/plugins/org.talend.designer.components.libs/libs_src/talend-ws/pom.xml
@@ -7,6 +7,14 @@
 	<version>1.0.5-20210629</version>
 	<packaging>jar</packaging>

+	<licenses>
+		<license>
+			<name>Apache License, Version 2.0</name>
+			<url>https://www.talendforge.org/modules/licenses/APACHE_v2.txt</url>
+			<distribution>may be downloaded from the Maven repository</distribution>
+		</license>
+	</licenses>
+
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

--- a/main/plugins/org.talend.designer.components.libs/libs_src/talendExcel/pom.xml
+++ b/main/plugins/org.talend.designer.components.libs/libs_src/talendExcel/pom.xml
@@ -4,12 +4,20 @@

 	<groupId>org.talend.components</groupId>
 	<artifactId>talendExcel</artifactId>
-	<version>1.12-20210908</version>
+	<version>1.13-20211020</version>
 	<packaging>jar</packaging>

 	<name>talendExcel</name>
 	<url>http://maven.apache.org</url>

+	<licenses>
+		<license>
+			<name>Apache License, Version 2.0</name>
+			<url>https://www.talendforge.org/modules/licenses/APACHE_v2.txt</url>
+			<distribution>may be downloaded from the Maven repository</distribution>
+		</license>
+	</licenses>
+
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<talend.nexus.url>https://artifacts-oss.talend.com</talend.nexus.url>
--- a/main/plugins/org.talend.designer.components.libs/libs_src/talendExcel/src/main/java/org/talend/ExcelTool.java
+++ b/main/plugins/org.talend.designer.components.libs/libs_src/talendExcel/src/main/java/org/talend/ExcelTool.java
@@ -1,6 +1,11 @@
 package org.talend;

-import com.monitorjbl.xlsx.StreamingReader;
+import java.io.*;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.poifs.crypt.EncryptionInfo;
 import org.apache.poi.poifs.crypt.EncryptionMode;
@@ -13,11 +18,7 @@ import org.apache.poi.xssf.usermodel.XSSFFont;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbookType;

-import java.io.*;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
+import com.monitorjbl.xlsx.StreamingReader;

 public class ExcelTool {

@@ -165,11 +166,10 @@ public class ExcelTool {
        if (this.streamingAppend) {
            wb = new SXSSFWorkbook(rowAccessWindowSize);

-            Workbook preWorkbookForAppend = null;
-            try {
-                preWorkbookForAppend = StreamingReader.builder()
-                        .rowCacheSize(100)
-                        .bufferSize(4096).password(password).open(new File(fileName));
+            try (InputStream fis = new FileInputStream(fileName);
+                 Workbook preWorkbookForAppend =
+                     StreamingReader.builder().rowCacheSize(100).bufferSize(4096)
+                         .password(password).open(fis)) {

                Iterator<Sheet> sheets = preWorkbookForAppend.sheetIterator();
                while (sheets.hasNext()) {
@@ -246,33 +246,29 @@ public class ExcelTool {
                    }
                }

-                if(sheet  == null) {
+                if (sheet == null) {
                    sheet = wb.createSheet(sheetName);
                }
-            } finally {
-                if (preWorkbookForAppend != null) {
-                    preWorkbookForAppend.close();
-                }
            }
-
            return;
        }

        // if use file instread of streaming, will throw an exception, TODO check why
-        InputStream inp = new FileInputStream(fileName);
-        wb = WorkbookFactory.create(inp, password);
-        sheet = wb.getSheet(sheetName);
-        if (sheet != null) {
-            if (appendSheet) {
-                if (sheet.getLastRowNum() != 0 || sheet.getRow(0) != null) {
-                    curY = sheet.getLastRowNum() + 1;
+        try (InputStream inp = new FileInputStream(fileName)) {
+            wb = WorkbookFactory.create(inp, password);
+            sheet = wb.getSheet(sheetName);
+            if (sheet != null) {
+                if (appendSheet) {
+                    if (sheet.getLastRowNum() != 0 || sheet.getRow(0) != null) {
+                        curY = sheet.getLastRowNum() + 1;
+                    }
+                } else {
+                    wb.removeSheetAt(wb.getSheetIndex(sheetName));
+                    sheet = wb.createSheet(sheetName);
                }
            } else {
-                wb.removeSheetAt(wb.getSheetIndex(sheetName));
                sheet = wb.createSheet(sheetName);
            }
-        } else {
-            sheet = wb.createSheet(sheetName);
        }
    }

@@ -286,9 +282,10 @@ public class ExcelTool {

    private void initPreXlsx(String fileName) throws Exception {
        // if use file instread of streaming, will throw an exception, TODO check why
-        InputStream preIns = new FileInputStream(fileName);
-        preWb = WorkbookFactory.create(preIns, password);
-        preSheet = preWb.getSheet(sheetName);
+        try (InputStream preIns = new FileInputStream(fileName)) {
+            preWb = WorkbookFactory.create(preIns, password);
+            preSheet = preWb.getSheet(sheetName);
+        }
    }

    public void setFont(String fontName) {
@@ -522,16 +519,23 @@ public class ExcelTool {
    public void writeExcel(OutputStream outputStream) throws Exception {
        try {
            wb.write(outputStream);
-            wb.close();
-            if (preWb != null) {
-                preWb.close();
-            }
        } finally {
-            if (existedOriginToClone != null) {
-                existedOriginToClone = null;
-            }
-            if (outputStream != null) {
-                outputStream.close();
+            try {
+                wb.close();
+            } finally {
+                try {
+                    if (preWb != null) {
+                        preWb.close();
+                    }
+                } finally {
+                    // close at the beginning to avoid additional try-finally block
+                    if (existedOriginToClone != null) {
+                        existedOriginToClone = null;
+                    }
+                    if (outputStream != null) {
+                        outputStream.close();
+                    }
+                }
            }
        }
    }
@@ -560,12 +564,15 @@ public class ExcelTool {
                fs.writeFilesystem(fileOutput);
            }
        } finally {
-            if(existedOriginToClone!=null) {
-                existedOriginToClone = null;
-            }
-            wb.close();
-            if(preWb != null){
-                preWb.close();
+            try {
+                wb.close();
+            } finally {
+                if (existedOriginToClone != null) {
+                    existedOriginToClone = null;
+                }
+                if (preWb != null) {
+                    preWb.close();
+                }
            }
        }
    }
--- a/main/plugins/org.talend.designer.components.libs/libs_src/talendMQConnectionUtil/pom.xml
+++ b/main/plugins/org.talend.designer.components.libs/libs_src/talendMQConnectionUtil/pom.xml
@@ -10,6 +10,14 @@

 	<name>talendMQConnectionUtil</name>

+	<licenses>
+		<license>
+			<name>Apache License, Version 2.0</name>
+			<url>https://www.talendforge.org/modules/licenses/APACHE_v2.txt</url>
+			<distribution>may be downloaded from the Maven repository</distribution>
+		</license>
+	</licenses>
+
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<powermock.version>1.7.4</powermock.version>
--- a/main/plugins/org.talend.designer.components.libs/libs_src/talendMsgMailUtil/pom.xml
+++ b/main/plugins/org.talend.designer.components.libs/libs_src/talendMsgMailUtil/pom.xml
@@ -7,6 +7,14 @@
 	<version>1.2-20201022</version>
 	<packaging>jar</packaging>

+	<licenses>
+		<license>
+			<name>Apache License, Version 2.0</name>
+			<url>https://www.talendforge.org/modules/licenses/APACHE_v2.txt</url>
+			<distribution>may be downloaded from the Maven repository</distribution>
+		</license>
+	</licenses>
+
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<talend.nexus.url>https://artifacts-oss.talend.com</talend.nexus.url>
--- a/main/plugins/org.talend.designer.components.libs/libs_src/talend_DB_mssqlUtil/pom.xml
+++ b/main/plugins/org.talend.designer.components.libs/libs_src/talend_DB_mssqlUtil/pom.xml
@@ -10,6 +10,14 @@
 	<name>talend_DB_mssqlUtil</name>
 	<url>http://maven.apache.org</url>

+	<licenses>
+		<license>
+			<name>Apache License, Version 2.0</name>
+			<url>https://www.talendforge.org/modules/licenses/APACHE_v2.txt</url>
+			<distribution>may be downloaded from the Maven repository</distribution>
+		</license>
+	</licenses>
+
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<talend.nexus.url>https://artifacts-oss.talend.com</talend.nexus.url>
--- a/main/plugins/org.talend.designer.components.libs/libs_src/talend_file_enhanced/pom.xml
+++ b/main/plugins/org.talend.designer.components.libs/libs_src/talend_file_enhanced/pom.xml
@@ -6,6 +6,14 @@
 	<name>talend_file_enhanced</name>
 	<version>1.1</version>

+	<licenses>
+		<license>
+			<name>Apache License, Version 2.0</name>
+			<url>https://www.talendforge.org/modules/licenses/APACHE_v2.txt</url>
+			<distribution>may be downloaded from the Maven repository</distribution>
+		</license>
+	</licenses>
+
 	<properties>
 		<talend.nexus.url>https://artifacts-oss.talend.com</talend.nexus.url>
 	</properties>
--- a/Show More
+++ b/Show More