fix(APPINT-33655) Solve Class Loading collision risk for Runtime executed Routes & Data Services

main/plugins/org.talend.designer.codegen/jet_stub/generic/component_util_indexedrecord_to_rowstruct.javajet

@@ -170,8 +170,16 @@ class IndexedRecordToRowStructGenerator {
             if (columnName.equals(dynamicColName)) {
             %>
                 java.util.Map<String, Object> dynamicValue_<%=cid%> = (java.util.Map<String, Object>) <%=codeVarSchemaEnforcer%>.get(<%=i%>);
+				org.apache.avro.Schema dynSchema_<%=cid%> = ((org.talend.codegen.enforcer.OutgoingDynamicSchemaEnforcer) <%=codeVarSchemaEnforcer%>).getDynamicFieldsSchema();
+                for (org.apache.avro.Schema.Field dynamicField_<%=cid%> : dynSchema_<%=cid%>.getFields()){
+					String name = dynamicField_<%=cid%>.name();
+					if("true".equals(dynamicField_<%=cid%>.getProp("ENABLE_SPECIAL_TABLENAME"))){
+							dynamicValue_<%=cid%>.put(dynamicField_<%=cid%>.getProp("talend.field.dbColumnName"), dynamicValue_<%=cid%>.get(name));
+							dynamicValue_<%=cid%>.remove(name);
+					}
+				}
                 for (java.util.Map.Entry<String, Object> dynamicValueEntry_<%=cid%> : dynamicValue_<%=cid%>.entrySet()) {
-                    <%=codeVarDynamic%>.addColumnValue(dynamicValueEntry_<%=cid%>.getValue());
+                    <%=codeVarDynamic%>.setColumnValue(<%=codeVarDynamic%>.getIndex(dynamicValueEntry_<%=cid%>.getKey()), dynamicValueEntry_<%=cid%>.getValue());
                 }
                 <%=codeVarRowStruct%>.<%=dynamicColName%> = <%=codeVarDynamic%>;
             <%

main/plugins/org.talend.designer.codegen/src/main/java/messages_fr.properties

@@ -10,7 +10,7 @@ CodeGenerator.getGraphicalNode2=------process.getGeneratingNodes()------
 CodeGenerator.JET.TimeOut=D\u00E9lai d'initialisation JET d\u00E9pass\u00E9
 CodeGenerator.newLine=\n\n\n\n
 CodeGenerator.Node.NotFound=N\u0153ud introuvable dans le processus courant
-CodeGenerator.Components.NotFound={0}\u00A0: Le composant est manquant\u00A0: {1}; utilisez -D{2}=false dans votre Studio ou CommandLine pour ignorer cette v\u00E9rification. Un message d'avertissement sera enregistr\u00E9 dans les logs.
+CodeGenerator.Comp.NotFound=Le composant est manquant\u00A0: {0}
 JavaRoutineSynchronizer.UnsupportedOperation.Exception1=M\u00E9thode non impl\u00E9ment\u00E9e : org.talend.designer.codegen.JavaRoutineSynchronizer line:49
 JavaRoutineSynchronizer.UnsupportedOperation.Exception2=M\u00E9thode non impl\u00E9ment\u00E9e : org.talend.designer.codegen.JavaRoutineSynchronizer line:58
 JetSkeletonManager.unableLoad=Impossible de charger le fichier de cache de la mise \u00E0 jour du squelette

main/plugins/org.talend.designer.codegen/src/main/java/messages_ja.properties

@@ -10,12 +10,12 @@ CodeGenerator.getGraphicalNode2=------process.getGeneratingNodes()------
 CodeGenerator.JET.TimeOut=JET\u306E\u521D\u671F\u5316\u51E6\u7406\u304C\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8\u3057\u307E\u3057\u305F
 CodeGenerator.newLine=\n\n\n\n
 CodeGenerator.Node.NotFound=\u73FE\u5728\u306E\u30D7\u30ED\u30BB\u30B9\u306B\u30CE\u30FC\u30C9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
-CodeGenerator.Components.NotFound={0}: \u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u304C\u6B20\u843D\u3057\u3066\u3044\u307E\u3059: {1}\u3002Studio\u3067 -D{2}=false\u3092\u4F7F\u3046\u3068\u3053\u306E\u30C1\u30A7\u30C3\u30AF\u304C\u30B9\u30AD\u30C3\u30D7\u3055\u308C\u3001\u8B66\u544A\u30E1\u30C3\u30BB\u30FC\u30B8\u304C\u30ED\u30B0\u30D5\u30A1\u30A4\u30EB\u306B\u8A18\u9332\u3055\u308C\u307E\u3059\u3002
+CodeGenerator.Component.NotFound=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u304C\u6B20\u843D\u3057\u3066\u3044\u307E\u3059: {0}\u3002Studio\u3067 -D{1}=false\u3092\u4F7F\u3046\u3068\u3053\u306E\u30C1\u30A7\u30C3\u30AF\u304C\u30B9\u30AD\u30C3\u30D7\u3055\u308C\u3001\u8B66\u544A\u30E1\u30C3\u30BB\u30FC\u30B8\u304C\u30ED\u30B0\u30D5\u30A1\u30A4\u30EB\u306B\u8A18\u9332\u3055\u308C\u307E\u3059\u3002
 JavaRoutineSynchronizer.UnsupportedOperation.Exception1=\u30E1\u30BD\u30C3\u30C9\u304C\u5B9F\u88C5\u3055\u308C\u3066\u3044\u307E\u305B\u3093\\: org.talend.designer.codegen.JavaRoutineSynchronizer line\\:49
 JavaRoutineSynchronizer.UnsupportedOperation.Exception2=\u30E1\u30BD\u30C3\u30C9\u304C\u5B9F\u88C5\u3055\u308C\u3066\u3044\u307E\u305B\u3093\\: org.talend.designer.codegen.JavaRoutineSynchronizer line\\:58
-JetSkeletonManager.unableLoad=\u30B9\u30B1\u30EB\u30C8\u30F3\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u30AD\u30E3\u30C3\u30B7\u30E5\u30D5\u30A1\u30A4\u30EB\u3092\u30ED\u30FC\u30C9\u3067\u304D\u307E\u305B\u3093
-JetSkeletonManager.unableSave=\u30B9\u30B1\u30EB\u30C8\u30F3\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u30AD\u30E3\u30C3\u30B7\u30E5\u30D5\u30A1\u30A4\u30EB\u3092\u4FDD\u5B58\u3067\u304D\u307E\u305B\u3093
-JetSkeletonManager.updateProblem=\u30B9\u30B1\u30EB\u30C8\u30F3\u6C38\u7D9A\u30C7\u30FC\u30BF\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u6642\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F,
+JetSkeletonManager.unableLoad=\u30B9\u30B1\u30EB\u30C8\u30F3\u66F4\u65B0\u30AD\u30E3\u30C3\u30B7\u30E5\u30D5\u30A1\u30A4\u30EB\u3092\u30ED\u30FC\u30C9\u3067\u304D\u307E\u305B\u3093
+JetSkeletonManager.unableSave=\u30B9\u30B1\u30EB\u30C8\u30F3\u66F4\u65B0\u30AD\u30E3\u30C3\u30B7\u30E5\u30D5\u30A1\u30A4\u30EB\u3092\u4FDD\u5B58\u3067\u304D\u307E\u305B\u3093
+JetSkeletonManager.updateProblem=\u30B9\u30B1\u30EB\u30C8\u30F3\u6C38\u7D9A\u30C7\u30FC\u30BF\u66F4\u65B0\u6642\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F,
 EmfEmittersPersistence.CodeGen.DataMissing=\u30B3\u30FC\u30C9\u751F\u6210\u306E\u30C7\u30FC\u30BF\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002\u5B8C\u5168\u306A\u30B3\u30FC\u30C9\u751F\u6210\u3092\u958B\u59CB\u3057\u3066\u3044\u307E\u3059\u3002
 CodeGeneratorEmittersPoolFactory.PersitentData.Error=\u6301\u7D9A\u30C7\u30FC\u30BF\u3092\u4FDD\u5B58\u3067\u304D\u307E\u305B\u3093:
 CodeGeneratorEmittersPoolFactory.JETEmitters.NoPresent=JETEmitter \u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u304C\u5B58\u5728\u3057\u307E\u305B\u3093\u3001\u5168\u4F53\u306E\u518D\u521D\u671F\u5316\u304C\u5FC5\u8981\u3067\u3059\u3002
@@ -29,7 +29,7 @@ CodeGeneratorEmittersPoolFactory.initialException=\u521D\u671F\u5316\u4E2D\u306B
 CodeGeneratorEmittersPoolFactory.initMessage=\u751F\u6210\u30A8\u30F3\u30B8\u30F3\u306E\u521D\u671F\u5316\u4E2D...
 CodeGeneratorEmittersPoolFactory.jetEmitterInitialException=JetEmitter\u306E\u521D\u671F\u5316\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
 CodeGeneratorEmittersPoolFactory.operationCanceled=\u64CD\u4F5C\u306F\u30AD\u30E3\u30F3\u30BB\u30EB\u3055\u308C\u307E\u3057\u305F
-CodeGeneratorEmittersPoolFactory.updatePaletteForEditors=\u30D1\u30EC\u30C3\u30C8\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
+CodeGeneratorEmittersPoolFactory.updatePaletteForEditors=\u30D1\u30EC\u30C3\u30C8\u3092\u66F4\u65B0
 CodeGeneratorService.invalidLanguage1=\u7121\u52B9\u306A\u8A00\u8A9E\u30BF\u30A4\u30D7\u3067\u3059\u3002
 CodeGeneratorService.invalidLanguage2=\u7121\u52B9\u306A\u8A00\u8A9E\u30BF\u30A4\u30D7\u3067\u3059\u3002
 CodeGenInit.addMarkers=\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9\u306B\u30DE\u30FC\u30AB\u30FC\u3092\u8FFD\u52A0\u4E2D

main/plugins/org.talend.designer.codegen/src/main/java/messages_zh_CN.properties

@@ -10,7 +10,7 @@ CodeGenerator.getGraphicalNode2=\u8FDB\u7A0B\u5F97\u5230\u751F\u6210\u8282\u70B9
 CodeGenerator.JET.TimeOut=JET \u521D\u59CB\u5316\u8D85\u65F6
 CodeGenerator.newLine=\n\n\n\n
 CodeGenerator.Node.NotFound=\u5728\u5F53\u524D
-CodeGenerator.Components.NotFound={0}: \u7EC4\u4EF6\u7F3A\u5931: {1}; \u5728 Studio \u6216\u547D\u4EE4\u884C\u4E2D\u4F7F\u7528 -D{2}=false \u53EF\u8DF3\u8FC7\u6B64\u9879\u68C0\u67E5\uFF0C\u540C\u65F6\u89E6\u53D1\u8B66\u544A\u6D88\u606F\u3002
+CodeGenerator.Component.NotFound=\u7EC4\u4EF6\u7F3A\u5931: {0}; \u5728 Studio \u6216\u547D\u4EE4\u884C\u4E2D\u4F7F\u7528 -D{1}=false \u53EF\u8DF3\u8FC7\u6B64\u9879\u68C0\u67E5\uFF0C\u540C\u65F6\u89E6\u53D1\u8B66\u544A\u6D88\u606F\u3002
 JavaRoutineSynchronizer.UnsupportedOperation.Exception1=\u65B9\u6CD5\u672A\u5B9E\u65BD\uFF1Aorg.talend.designer.codegen.JavaRoutineSynchronizer line:49
 JavaRoutineSynchronizer.UnsupportedOperation.Exception2=\u65B9\u6CD5\u672A\u5B9E\u65BD\uFF1Aorg.talend.designer.codegen.JavaRoutineSynchronizer line:58
 JetSkeletonManager.unableLoad=\u65E0\u6CD5\u52A0\u8F7D\u4E3B\u5E72\u66F4\u65B0\u7F13\u5B58\u6587\u4EF6

main/plugins/org.talend.designer.components.exchange/src/main/java/messages_ja.properties

@@ -14,13 +14,13 @@ DownloadedExtensionsComposite.DownloadDate=\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\
 DownloadedExtensionsComposite.OperateStatus=\u30B9\u30C6\u30FC\u30BF\u30B9\u64CD\u4F5C
 DownloadedExtensionsComposite.installOperateStatus=\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB
 DownloadedExtensionsComposite.installedOperateStatus=\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u6E08\u307F
-DownloadedExtensionsComposite.updateOperateStatus=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
+DownloadedExtensionsComposite.updateOperateStatus=\u66F4\u65B0
 MyExtensionsComposite.ExtensionName=Extension\u540D
 MyExtensionsComposite.Version=\u30D0\u30FC\u30B8\u30E7\u30F3
 MyExtensionsComposite.UploadDate=\u30A2\u30C3\u30D7\u30ED\u30FC\u30C9\u65E5\u4ED8
 MyExtensionsComposite.AddNewExtensionTitle=\u65B0\u898FExtension\u8FFD\u52A0
 MyExtensionsComposite.UpLoadNewVersionOperateStatus=\u65B0\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u30A2\u30C3\u30D7\u30ED\u30FC\u30C9
-MyExtensionsComposite.UpdateOperateStatus=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
+MyExtensionsComposite.UpdateOperateStatus=\u66F4\u65B0
 MyExtensionsComposite.ModifyOperateStatus=\u5909\u66F4
 MyExtensionsComposite.DeleteOperateStatus=\u524A\u9664
 MyExtensionsComposite.Form.Return=\u623B\u308A\u5024
@@ -45,7 +45,7 @@ MyExtensionsComposite.Form.Upload.Browse.SelectFile=\u30A2\u30C3\u30D7\u30ED\u30
 MyExtensionsComposite.Form.DeleteExtensionTile=Extension\u524A\u9664
 MyExtensionsComposite.Form.DeleteExtensionMessage=\u3053\u306E\u62E1\u5F35\u5B50\u3092\u524A\u9664\u3057\u307E\u3059\u304B?
 MyExtensionsComposite.Form.UploadExtension=Extension\u30A2\u30C3\u30D7\u30ED\u30FC\u30C9
-MyExtensionsComposite.Form.UpdateExtension=Extension\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
+MyExtensionsComposite.Form.UpdateExtension=Extension\u66F4\u65B0
 MyExtensionsComposite.Form.ModifyExtension=Extension\u4FEE\u6B63
 Exchange.logon.error=Exchange\u30E6\u30FC\u30B6\u30FC\u304C\u767B\u9332\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u521D\u671F\u8A2D\u5B9A\u3092\u4F7F\u7528\u3057\u3066\u767B\u9332\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 RefreshJob.FindExtensions.Title=\u53D6\u5F97\u53EF\u80FD\u306Aextensions
@@ -77,7 +77,7 @@ DownloadComponenentsAction_failureMessage=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u
 DownloadComponenentsAction.installExchange=Exchange\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u3092\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB
 DownloadComponenentsAction.DownloadTaskTitle=Exchange\u304B\u3089\u30D5\u30A1\u30A4\u30EB\u3092\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9
 DownloadComponenentsAction.DownloadTaskName=\u30D5\u30A1\u30A4\u30EB\u306E\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u4E2D URL \\:
-DownloadComponenentsAction.ReloadPalette=\u30D1\u30EC\u30C3\u30C8\u306E\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8...
+DownloadComponenentsAction.ReloadPalette=\u30D1\u30EC\u30C3\u30C8\u306E\u66F4\u65B0...
 DownloadComponenentsAction.DownloadFailure=\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u5931\u6557\u3002
 DownloadComponenentsAction.DownloadFailureTip=\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u8A2D\u5B9A\u3092\u5909\u66F4\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 DownloadComponenentsAction.installComponentsTitle=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB
@@ -85,7 +85,7 @@ ExchangeWebService.insertionExtensionSuccessful=Extension\u306E\u30A4\u30F3\u30B
 ExchangeWebService.downloadingExtensionSuccessful=Extension\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u6210\u529F\u3002
 ExchangeWebService.deleteExtensionSuccessful=Extension\u524A\u9664\u6210\u529F\u3002
 ExchangeWebService.insertReviewSuccessful=Review\u633F\u5165\u6210\u529F\u3002
-ExchangeWebService.updateRevisionSuccessful=\u30EA\u30D3\u30B8\u30E7\u30F3\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u6210\u529F\u3002
+ExchangeWebService.updateRevisionSuccessful=\u30EA\u30D3\u30B8\u30E7\u30F3\u66F4\u65B0\u6210\u529F\u3002
 ExchangeWebService.insertionRevisionSuccessful=\u30EA\u30D3\u30B8\u30E7\u30F3\u633F\u5165\u6210\u529F\u3002
 ImportExchangeDialog.dialogTitle=Talend Exchange \u304B\u3089\u9805\u76EE\u306E\u9078\u629E
 ImportExchangeDialog.WARNING=\u8B66\u544A
@@ -97,5 +97,5 @@ ImportExchangeDialog.LATEST_REVISION=\u6700\u65B0\u30EA\u30D3\u30B8\u30E7\u30F3
 ImportExchangeDialog.EXTENSION_DESCRIPTION=\u62E1\u5F35\u306E\u8AAC\u660E
 ImportExchangeDialog.download.extensions=\u62E1\u5F35\u6A5F\u80FD\u3092\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u4E2D\u3067\u3059\u3002\u66AB\u304F\u304A\u5F85\u3061\u304F\u3060\u3055\u3044\u3002
 ImportExchangeDialog.REFRESH_BUTTON=\u66F4\u65B0
-ImportExchangeDialog.REFRESHING_PROGRESSBAR=\u66F4\u65B0\u4E2D\u3067\u3059\u3002\u66AB\u304F\u304A\u5F85\u3061\u304F\u3060\u3055\u3044\u3002
+ImportExchangeDialog.REFRESHING_PROGRESSBAR=\u30EA\u30D5\u30EC\u30C3\u30B7\u30E5\u4E2D\u3067\u3059\u3002\u66AB\u304F\u304A\u5F85\u3061\u304F\u3060\u3055\u3044\u3002
 ImportExchangeDialog.OPERATION_CANCELLED=\u64CD\u4F5C\u306F\u30AD\u30E3\u30F3\u30BB\u30EB\u3055\u308C\u307E\u3057\u305F

main/plugins/org.talend.designer.components.libs/libs_src/checkArchive/pom.xml

@@ -0,0 +1,77 @@
+<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>
+  <groupId>org.talend.components</groupId>
+  <artifactId>checkArchive</artifactId>
+  <version>1.2-20210901</version>
+  <name>checkArchive</name>
+  <description>Dependence for tFileArchive and tFileUnAchive</description>
+  <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>
+		<java.source.version>1.8</java.source.version>
+	</properties>
+
+	<distributionManagement>
+		<snapshotRepository>
+			<id>talend_nexus_deployment</id>
+			<url>${talend.nexus.url}/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+		</snapshotRepository>
+		<repository>
+			<id>talend_nexus_deployment</id>
+			<url>${talend.nexus.url}/nexus/content/repositories/TalendOpenSourceRelease/</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+		</repository>
+	</distributionManagement>
+
+	<dependencies>
+  <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-compress -->
+<dependency>
+    <groupId>org.apache.commons</groupId>
+    <artifactId>commons-compress</artifactId>
+    <version>1.21</version>
+</dependency>
+	</dependencies>
+	<build>
+		<resources>
+			<resource>
+				<directory>src/main/java</directory>
+			</resource>
+		</resources>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.3.2</version>
+				<configuration>
+					<source>${java.source.version}</source>
+					<target>${java.source.version}</target>
+					<showDeprecation>true</showDeprecation>
+					<showWarnings>true</showWarnings>
+					<compilerArgument>-XDignore.symbol.file</compilerArgument>
+					<fork>true</fork>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>

main/plugins/org.talend.designer.components.libs/libs_src/checkArchive/src/main/java/org/talend/archive/IntegrityUtil.java

@@ -1,183 +1,184 @@
-package com.talend.compress.zip;
-
-import org.apache.commons.compress.archivers.ArchiveEntry;
-import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
-import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream;
-import org.apache.commons.compress.archivers.zip.ZipFile;
-
-import javax.crypto.Cipher;
-import javax.crypto.CipherInputStream;
-import javax.crypto.SecretKey;
-import javax.crypto.SecretKeyFactory;
-import javax.crypto.spec.PBEKeySpec;
-import javax.crypto.spec.PBEParameterSpec;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.zip.GZIPInputStream;
-
-// import javax.crypto.Cipher;
-
-public class IntegrityUtil {
-
-    /**
-     * Is used to check if the zip file is corrupted/destroyed
-     * 
-     * @param file
-     * @return
-     */
-    public static boolean isZipValid(final File file) {
-        ZipFile zipFile = null;
-
-        try {
-            zipFile = new ZipFile(file);
-
-            return true;
-        } catch (IOException e) {
-            return false;
-        } finally {
-            try {
-                if (zipFile != null) {
-                    zipFile.close();
-                    zipFile = null;
-                }
-            } catch (IOException e) {
-
-            }
-        }
-    }
-
-    public static void validate(final File file) {
-        ZipFile zipFile = null;
-
-        try {
-            zipFile = new ZipFile(file);
-
-        } catch (IOException e) {
-        } finally {
-            try {
-                if (zipFile != null) {
-                    zipFile.close();
-                    zipFile = null;
-                }
-            } catch (IOException e) {
-
-            }
-        }
-    }
-
-    /**
-     * To check if the encrpted zip file is corrupted or not
-     * 
-     * @param file
-     * @param password
-     * @return
-     */
-    public static boolean isEncryptedZipValid(final File file, String password) {
-        ZipArchiveInputStream input = null;
-        InputStream target = null;
-        try {
-            target = new FileInputStream(file);
-            target = new CipherInputStream(target, createCipher(Cipher.DECRYPT_MODE, password));
-            input = new ZipArchiveInputStream(target);
-            ArchiveEntry entry = input.getNextEntry();
-            return true;
-
-        } catch (IOException e) {
-            return false;
-        } catch (Exception e) {
-            return false;
-        } finally {
-            try {
-                if (input != null) {
-                    input.close();
-                    input = null;
-                }
-                if (target != null) {
-                    target.close();
-                    target = null;
-                }
-            } catch (IOException e) {
-            }
-        }
-    }
-
-    /**
-     * Used to check tar.gz/.tgz/.gz file is corrupted/destroyed
-     * 
-     * @param fileName
-     * @return
-     */
-    public static boolean isGZIPValid(final String fileName) {
-        GZIPInputStream inputStream = null;
-        InputStream is = null;
-        try {
-    		is = new FileInputStream(new File(fileName));
-            inputStream = new GZIPInputStream(is);
-            return true;
-        } catch (IOException e) {
-            return false;
-        }finally {
-            try {
-                if (inputStream != null) {
-                    inputStream.close();
-                    inputStream = null;
-                } else if(is != null) {
-                	is.close();
-                	is = null;
-                }
-            } catch (IOException e) {
-            }
-        }
-    }
-    
-    /**
-     * Used to check tar.tar file is corrupted/destroyed
-     * 
-     * @param fileName
-     * @return
-     */
-    public static boolean isTarValid(final String fileName) {
-    	TarArchiveInputStream inputStream = null;
-        InputStream is = null;
-        try {
-    		is = new FileInputStream(new File(fileName));
-            inputStream = new TarArchiveInputStream(is);
-            return inputStream.canReadEntryData(inputStream.getNextEntry());
-            
-        } catch (IOException e) {
-            return false;
-        }finally {
-            try {
-                if (inputStream != null) {
-                    inputStream.close();
-                    inputStream = null;
-                } else if(is != null) {
-                	is.close();
-                	is = null;
-                }
-            } catch (IOException e) {
-            }
-        }
-    }
-
-    /**
-     * 
-     * @param mode
-     * @param password
-     * @return
-     * @throws Exception
-     */
-    public static Cipher createCipher(int mode, String password) throws Exception {
-        String alg = "PBEWithSHA1AndDESede"; // BouncyCastle has better algorithms
-        PBEKeySpec keySpec = new PBEKeySpec(password.toCharArray());
-        SecretKeyFactory keyFactory = SecretKeyFactory.getInstance(alg);
-        SecretKey secretKey = keyFactory.generateSecret(keySpec);
-
-        Cipher cipher = Cipher.getInstance("PBEWithSHA1AndDESede");
-        cipher.init(mode, secretKey, new PBEParameterSpec("saltsalt".getBytes(), 2000));
-
-        return cipher;
-    }
-}
+package org.talend.archive;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.zip.GZIPInputStream;
+
+import javax.crypto.Cipher;
+import javax.crypto.CipherInputStream;
+import javax.crypto.SecretKey;
+import javax.crypto.SecretKeyFactory;
+import javax.crypto.spec.PBEKeySpec;
+import javax.crypto.spec.PBEParameterSpec;
+
+import org.apache.commons.compress.archivers.ArchiveEntry;
+import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
+import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream;
+import org.apache.commons.compress.archivers.zip.ZipFile;
+
+// import javax.crypto.Cipher;
+
+public class IntegrityUtil {
+
+    /**
+     * Is used to check if the zip file is corrupted/destroyed
+     * 
+     * @param file
+     * @return
+     */
+    public static boolean isZipValid(final File file) {
+        ZipFile zipFile = null;
+
+        try {
+            zipFile = new ZipFile(file);
+
+            return true;
+        } catch (IOException e) {
+            return false;
+        } finally {
+            try {
+                if (zipFile != null) {
+                    zipFile.close();
+                    zipFile = null;
+                }
+            } catch (IOException e) {
+
+            }
+        }
+    }
+
+    public static void validate(final File file) {
+        ZipFile zipFile = null;
+
+        try {
+            zipFile = new ZipFile(file);
+
+        } catch (IOException e) {
+        } finally {
+            try {
+                if (zipFile != null) {
+                    zipFile.close();
+                    zipFile = null;
+                }
+            } catch (IOException e) {
+
+            }
+        }
+    }
+
+    /**
+     * To check if the encrpted zip file is corrupted or not
+     * 
+     * @param file
+     * @param password
+     * @return
+     */
+    public static boolean isEncryptedZipValid(final File file, String password) {
+        ZipArchiveInputStream input = null;
+        InputStream target = null;
+        try {
+            target = new FileInputStream(file);
+            target = new CipherInputStream(target, createCipher(Cipher.DECRYPT_MODE, password));
+            input = new ZipArchiveInputStream(target);
+            ArchiveEntry entry = input.getNextEntry();
+            return true;
+
+        } catch (IOException e) {
+            return false;
+        } catch (Exception e) {
+            return false;
+        } finally {
+            try {
+                if (input != null) {
+                    input.close();
+                    input = null;
+                }
+                if (target != null) {
+                    target.close();
+                    target = null;
+                }
+            } catch (IOException e) {
+            }
+        }
+    }
+
+    /**
+     * Used to check tar.gz/.tgz/.gz file is corrupted/destroyed
+     * 
+     * @param fileName
+     * @return
+     */
+    public static boolean isGZIPValid(final String fileName) {
+        GZIPInputStream inputStream = null;
+        InputStream is = null;
+        try {
+    		is = new FileInputStream(new File(fileName));
+            inputStream = new GZIPInputStream(is);
+            return true;
+        } catch (IOException e) {
+            return false;
+        }finally {
+            try {
+                if (inputStream != null) {
+                    inputStream.close();
+                    inputStream = null;
+                } else if(is != null) {
+                	is.close();
+                	is = null;
+                }
+            } catch (IOException e) {
+            }
+        }
+    }
+    
+    /**
+     * Used to check tar.tar file is corrupted/destroyed
+     * 
+     * @param fileName
+     * @return
+     */
+    public static boolean isTarValid(final String fileName) {
+    	TarArchiveInputStream inputStream = null;
+        InputStream is = null;
+        try {
+    		is = new FileInputStream(new File(fileName));
+            inputStream = new TarArchiveInputStream(is);
+            return inputStream.canReadEntryData(inputStream.getNextEntry());
+            
+        } catch (IOException e) {
+            return false;
+        }finally {
+            try {
+                if (inputStream != null) {
+                    inputStream.close();
+                    inputStream = null;
+                } else if(is != null) {
+                	is.close();
+                	is = null;
+                }
+            } catch (IOException e) {
+            }
+        }
+    }
+
+    /**
+     * 
+     * @param mode
+     * @param password
+     * @return
+     * @throws Exception
+     */
+    public static Cipher createCipher(int mode, String password) throws Exception {
+        String alg = "PBEWithSHA1AndDESede"; // BouncyCastle has better algorithms
+        PBEKeySpec keySpec = new PBEKeySpec(password.toCharArray());
+        SecretKeyFactory keyFactory = SecretKeyFactory.getInstance(alg);
+        SecretKey secretKey = keyFactory.generateSecret(keySpec);
+
+        Cipher cipher = Cipher.getInstance("PBEWithSHA1AndDESede");
+        cipher.init(mode, secretKey, new PBEParameterSpec("saltsalt".getBytes(), 2000));
+
+        return cipher;
+    }
+}

main/plugins/org.talend.designer.components.libs/libs_src/json-lib-talend/pom.xml

@@ -7,7 +7,7 @@
    <groupId>net.sf.json-lib</groupId>
    <artifactId>json-lib</artifactId>
    <packaging>jar</packaging>
-   <version>2.4.7-talend</version>
+   <version>2.4.6-talend</version>
    <name>json-lib</name>
 
 	<properties>

main/plugins/org.talend.designer.components.libs/libs_src/json-lib-talend/src/main/java/net/sf/json/xml/XMLSerializer.java

@@ -48,7 +48,6 @@ import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.StringReader;
 import java.io.UnsupportedEncodingException;
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -173,11 +172,6 @@ public class XMLSerializer {
     * flag for if parse empty elements as empty strings
     */
    private boolean useEmptyStrings;
-   
-   /**
-    * flag to use scientific notation while working with Float values.
-    */
-   private boolean useScientificNotation;
 
    /**
     * Creates a new XMLSerializer with default options.<br>
@@ -211,7 +205,6 @@ public class XMLSerializer {
       setKeepCData( false );
       setEscapeLowerChars( false );
       setKeepArrayName( false );
-      setUseScientificNotation( false );
    }
 
    /**
@@ -367,15 +360,7 @@ public class XMLSerializer {
       return typeHintsEnabled;
    }
 
-   
    /**
-    * @return the useScientificNotation value
-    */
-    public boolean isUseScientificNotation() {
-       return useScientificNotation;
-    }
-
-    /**
     * Creates a JSON value from a XML string.
     *
     * @param xml A well-formed xml document in a String
@@ -667,15 +652,6 @@ public class XMLSerializer {
       this.typeHintsCompatibility = typeHintsCompatibility;
    }
 
-   
-   /**
-    * Sets whether to use scientific notation while working with Float values.
-    * @param useScientificNotation Value of the useScientificNotation to set.
-    */
-   public void setUseScientificNotation(boolean useScientificNotation) {
-      this.useScientificNotation = useScientificNotation;
-}
-
    /**
     * Sets wether JSON types will be included as attributes.
     */
@@ -1359,12 +1335,12 @@ public class XMLSerializer {
                      jsonArray.element(Integer.valueOf(element.getValue()));
                   }
                } catch (NumberFormatException e) {
-                  jsonArray.element(processFloatValues(element));
+                  jsonArray.element(Double.valueOf(element.getValue()));
                }
             } else if (type.compareToIgnoreCase(JSONTypes.INTEGER) == 0) {
                jsonArray.element(Integer.valueOf(element.getValue()));
             } else if (type.compareToIgnoreCase(JSONTypes.FLOAT) == 0) {
-               jsonArray.element(processFloatValues(element));
+               jsonArray.element(Double.valueOf(element.getValue()));
             } else if (type.compareToIgnoreCase(JSONTypes.FUNCTION) == 0) {
                String[] params = null;
                String text = element.getValue();
@@ -1395,14 +1371,6 @@ public class XMLSerializer {
          }
       }
    }
-   
-   private Object processFloatValues(Element element) {
-       if (!isUseScientificNotation()) {
-           return new BigDecimal(element.getValue());
-        } else {
-           return Double.valueOf(element.getValue());
-        }
-   }
 
    private void setValue( JSONObject jsonObject, Element element, String defaultType ) {
       String clazz = getClass( element );
@@ -1455,12 +1423,12 @@ public class XMLSerializer {
                      setOrAccumulate(jsonObject, key, Integer.valueOf(element.getValue()));
                   }
                } catch (NumberFormatException e) {
-                  setOrAccumulate(jsonObject, key, processFloatValues(element));
+                  setOrAccumulate(jsonObject, key, Double.valueOf(element.getValue()));
                }
             } else if (type.compareToIgnoreCase(JSONTypes.INTEGER) == 0) {
                setOrAccumulate(jsonObject, key, Integer.valueOf(element.getValue()));
             } else if (type.compareToIgnoreCase(JSONTypes.FLOAT) == 0) {
-               setOrAccumulate(jsonObject, key, processFloatValues(element));
+               setOrAccumulate(jsonObject, key, Double.valueOf(element.getValue()));
             } else if (type.compareToIgnoreCase(JSONTypes.FUNCTION) == 0) {
                String[] params = null;
                String text = element.getValue();

main/plugins/org.talend.designer.components.libs/libs_src/talend-httputil/pom.xml

@@ -4,7 +4,7 @@
 	<groupId>org.talend</groupId>
 	<artifactId>talend-httputil</artifactId>
 	<name>talend-httputil</name>
-	<version>1.0.7</version>
+	<version>1.0.6</version>
 
 	<licenses>
 		<license>
@@ -28,7 +28,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.13.2.2</version>
+            <version>2.11.4</version>
         </dependency>
         
         <dependency>
@@ -36,6 +36,14 @@
             <artifactId>json-lib</artifactId>
             <version>2.4</version>
         </dependency>
+        
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.0</version>
+			<type>jar</type>
+			<optional>true</optional>
+		</dependency>
 	</dependencies>
 
 	<distributionManagement>

main/plugins/org.talend.designer.components.libs/libs_src/talend-httputil/src/main/java/org/talend/http/HttpUtil.java

@@ -1,9 +1,14 @@
 package org.talend.http;
 
-import net.sf.json.JSONObject;
+import java.util.List;
 
 import org.apache.http.entity.ContentType;
 import org.apache.http.util.EntityUtils;
+import org.apache.http.entity.ContentType;
+
+import net.sf.json.JSONObject;
+
+import java.util.ArrayList;
 
 public class HttpUtil {
 	

main/plugins/org.talend.designer.components.libs/libs_src/talend-mscrm/pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.talend.components</groupId>
 	<artifactId>talend-mscrm</artifactId>
-	<version>3.11-20220401</version>
+	<version>3.11-20220124</version>
 	<packaging>jar</packaging>
 
 	<name>talend-mscrm</name>
@@ -27,8 +27,7 @@
 		<httpcore.version>4.4.13</httpcore.version>
 		<junit.version>4.13.2</junit.version>
 		<adal4j.version>1.6.4-20211021</adal4j.version>
-		<jackson.version>2.13.2</jackson.version>
-		<jackson-databind.version>2.13.2.2</jackson-databind.version>
+		<jackson.version>2.11.4</jackson.version>
 
 		<!-- plugin's versions -->
 		<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
@@ -157,7 +156,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>${jackson-databind.version}</version>
+            <version>${jackson.version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>

main/plugins/org.talend.designer.components.libs/libs_src/talendzip/pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.talend.components</groupId>
 	<artifactId>talendzip</artifactId>
-	<version>1.3</version>
+	<version>1.2-20210901</version>
 
 	<licenses>
 		<license>
@@ -61,7 +61,7 @@
 		<dependency>
 			<groupId>net.lingala.zip4j</groupId>
 			<artifactId>zip4j</artifactId>
-			<version>2.10.0</version>
+			<version>1.3.3</version>
 		</dependency>
 
 		<dependency>
@@ -70,5 +70,10 @@
 			<version>1.21</version>
 		</dependency>
 
+		<dependency>
+			<groupId>org.talend.components</groupId>
+			<artifactId>checkArchive</artifactId>
+			<version>1.2-20210901</version>
+		</dependency>
 	</dependencies>
 </project>

main/plugins/org.talend.designer.components.libs/libs_src/talendzip/src/main/java/com/talend/compress/zip/Unzip.java

@@ -1,11 +1,10 @@
 package com.talend.compress.zip;
 
 import java.io.File;
-import java.nio.charset.Charset;
 import java.util.List;
 import java.util.Optional;
 
-import net.lingala.zip4j.ZipFile;
+import net.lingala.zip4j.core.ZipFile;
 import net.lingala.zip4j.model.FileHeader;
 
 public class Unzip {
@@ -97,10 +96,9 @@ public class Unzip {
 					"Please enter the password and try again..");
 		}
 
-		ZipFile zipFile = new ZipFile(sourceZip,password.toCharArray());
-
+		ZipFile zipFile = new ZipFile(sourceZip);
 		if(encording != null){
-            zipFile.setCharset(Charset.forName(encording));
+            zipFile.setFileNameCharset(encording);
         }
 
 		if (checkArchive) {
@@ -110,6 +108,10 @@ public class Unzip {
 			}
 		}
 
+		if (zipFile.isEncrypted()) {
+			zipFile.setPassword(password);
+		}
+
 		List fileHeaderList = zipFile.getFileHeaders();
 
 		if (fileHeaderList == null) {
@@ -128,7 +130,7 @@ public class Unzip {
 				filename = filename.substring(filename.lastIndexOf('/') + 1);
 			}
 
-			zipFile.extractFile(fileHeader, targetDir, filename);
+			zipFile.extractFile(fileHeader, targetDir, null, filename);
 			util.addUnzippedFiles(targetDir, filename);
 		}
 	}
@@ -145,7 +147,7 @@ public class Unzip {
 		}
 
 		if (checkArchive) {
-			if (!IntegrityUtil.isEncryptedZipValid(file,
+			if (!org.talend.archive.IntegrityUtil.isEncryptedZipValid(file,
 					password)) {
 				throw new RuntimeException("The file " + sourceZip
 						+ " is corrupted, process terminated...");
@@ -156,7 +158,7 @@ public class Unzip {
 		try {
 			is = new java.io.FileInputStream(sourceZip);
 			is = new javax.crypto.CipherInputStream(is,
-					IntegrityUtil.createCipher(
+					org.talend.archive.IntegrityUtil.createCipher(
 							javax.crypto.Cipher.DECRYPT_MODE, password));
 			org.apache.commons.compress.archivers.zip.ZipArchiveInputStream input = new org.apache.commons.compress.archivers.zip.ZipArchiveInputStream(
 					new java.io.BufferedInputStream(is),Optional.ofNullable(encording).orElse("UTF8"));
@@ -182,7 +184,7 @@ public class Unzip {
 	// apache common compress impl
 	public void doUnzipWithoutDecryption() throws Exception {
 		if (checkArchive
-				&& !IntegrityUtil
+				&& !org.talend.archive.IntegrityUtil
 						.isZipValid(new java.io.File(sourceZip))) {
 			Thread.sleep(1000); // To make the process terminated after the
 								// System.out.println

main/plugins/org.talend.designer.components.libs/libs_src/talendzip/src/main/java/com/talend/compress/zip/Zip.java

@@ -5,20 +5,16 @@ import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.zip.GZIPOutputStream;
 
-import net.lingala.zip4j.ZipFile;
+import net.lingala.zip4j.core.ZipFile;
 import net.lingala.zip4j.model.ZipParameters;
+import net.lingala.zip4j.util.Zip4jConstants;
 
-import net.lingala.zip4j.model.enums.AesKeyStrength;
-import net.lingala.zip4j.model.enums.CompressionLevel;
-import net.lingala.zip4j.model.enums.CompressionMethod;
-import net.lingala.zip4j.model.enums.EncryptionMethod;
 import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
 import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
 import org.apache.commons.compress.compressors.gzip.GzipUtils;
@@ -30,7 +26,7 @@ public class Zip {
     private String targetZip;
     private boolean overwriteExistTargetZip = true;
     private boolean makeTargetDir = false;
-    private CompressionLevel compressLevel = CompressionLevel.MEDIUM_FAST;
+    private int compressLevel = 4;
     private String encoding = "ISO-8859-15";
 
     private boolean allFiles = true;
@@ -44,8 +40,8 @@ public class Zip {
 
     private boolean useZip4jEncryption = false;
 
-    private EncryptionMethod encryptionMethod = EncryptionMethod.AES;
-    private AesKeyStrength aesKeyStrength = AesKeyStrength.KEY_STRENGTH_256;
+    private int encryptionMethod = Zip4jConstants.ENC_METHOD_AES;
+    private int aesKeyStrength = Zip4jConstants.AES_STRENGTH_256;
 
     private String archiveFormat = "zip";
     private boolean syncFlush;
@@ -83,29 +79,19 @@ public class Zip {
     }
 
     public void setCompressLevel(int compressLevel) {
-        switch (compressLevel){
-            case 0:
-                this.compressLevel = CompressionLevel.NO_COMPRESSION;
-                break;
-            case 4:
-                this.compressLevel = CompressionLevel.MEDIUM_FAST;
-                break;
-            case 9:
-                this.compressLevel = CompressionLevel.ULTRA;
-                break;
-        }
+        this.compressLevel = compressLevel;
     }
 
     public void setMakeTargetDir(boolean makeTargetDir) {
         this.makeTargetDir = makeTargetDir;
     }
 
-    public void setEncryptionMethod(String encryptionMethod) {
-        this.encryptionMethod = EncryptionMethod.valueOf(encryptionMethod);
+    public void setEncryptionMethod(int encryptionMethod) {
+        this.encryptionMethod = encryptionMethod;
     }
 
     public void setAesKeyStrength(int aesKeyStrength) {
-        this.aesKeyStrength = AesKeyStrength.getAesKeyStrengthFromRawCode(aesKeyStrength);
+        this.aesKeyStrength = aesKeyStrength;
     }
 
     public String getArchiveFormat() {
@@ -199,7 +185,7 @@ public class Zip {
         targetFile.setLastModified(System.currentTimeMillis());
         FileOutputStream fos = new FileOutputStream(targetFile);
         final boolean syncFlush = this.syncFlush;
-        final int compressLevel = this.compressLevel.getLevel();
+        final int compressLevel = this.compressLevel;
         TarArchiveOutputStream taos = new TarArchiveOutputStream(new GZIPOutputStream(fos, syncFlush) {
             {
             	this.def.setLevel(compressLevel);
@@ -236,7 +222,7 @@ public class Zip {
         OutputStream out = new FileOutputStream(tarFile);
         try {
             final boolean syncFlush = this.syncFlush;
-            final int compressLevel = this.compressLevel.getLevel();
+            final int compressLevel = this.compressLevel;
         	GZIPOutputStream gcos = new GZIPOutputStream(out, syncFlush) {
                 {
                 	this.def.setLevel(compressLevel);
@@ -261,7 +247,7 @@ public class Zip {
         try {
             output_stream = new java.io.FileOutputStream(targetZip);
             if (isEncrypted && !"".equals(password)) {
-                output_stream = new javax.crypto.CipherOutputStream(output_stream, IntegrityUtil.createCipher(
+                output_stream = new javax.crypto.CipherOutputStream(output_stream, org.talend.archive.IntegrityUtil.createCipher(
                         javax.crypto.Cipher.ENCRYPT_MODE, password));
             }
         } catch (Exception e) {
@@ -274,7 +260,7 @@ public class Zip {
         org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream out = null;
         out = new org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream(
                 new java.io.BufferedOutputStream(output_stream));
-        out.setLevel(compressLevel.getLevel());
+        out.setLevel(compressLevel);
         // set filename & comment encoding
         out.setEncoding(encoding);
         if ("ALWAYS".equals(zip64Mode)) {
@@ -316,26 +302,26 @@ public class Zip {
     // zip4j impl
     private void doZip2(final File source, final List<File> list) throws Exception {
 
-        ZipFile zipFile = new ZipFile(targetZip,password.toCharArray());
+        ZipFile zipFile = new ZipFile(targetZip);
         if ("UTF-8".equalsIgnoreCase(encoding)) {
             encoding = "UTF8";
         }
-        zipFile.setCharset(Charset.forName(encoding));
+        zipFile.setFileNameCharset(encoding);
 
         ZipParameters params = new ZipParameters();
-        params.setCompressionMethod(CompressionMethod.DEFLATE);
+        params.setCompressionMethod(Zip4jConstants.COMP_DEFLATE);
         params.setCompressionLevel(compressLevel);
 
         if (isEncrypted && !"".equals(password)) {
             params.setEncryptFiles(true);
             params.setEncryptionMethod(encryptionMethod);
-            if (encryptionMethod == EncryptionMethod.AES) {
-
+            if (Zip4jConstants.ENC_METHOD_AES == encryptionMethod) {
                 params.setAesKeyStrength(aesKeyStrength);
             }
+            params.setPassword(password);
         }
 
         params.setDefaultFolderPath(source.getAbsoluteFile().getPath());
-        zipFile.addFiles(list, params);
+        zipFile.addFiles((ArrayList) list, params);
     }
 }

main/plugins/org.talend.designer.components.localprovider/components/tAS400Output/tAS400Output_messages_ja.properties

@@ -20,21 +20,21 @@ CLEAR_TABLE.NAME=\u30C6\u30FC\u30D6\u30EB\u30C7\u30FC\u30BF\u306E\u30AF\u30EA\u3
 COMMIT_EVERY.NAME=\u30B3\u30DF\u30C3\u30C8\u3059\u308B\u9593\u9694
 DATA_ACTION.ITEM.DELETE=\u524A\u9664
 DATA_ACTION.ITEM.INSERT=\u633F\u5165
-DATA_ACTION.ITEM.INSERT_OR_UPDATE=\u633F\u5165\u307E\u305F\u306F\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
-DATA_ACTION.ITEM.UPDATE=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
-DATA_ACTION.ITEM.UPDATE_OR_INSERT=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u307E\u305F\u306F\u633F\u5165
+DATA_ACTION.ITEM.INSERT_OR_UPDATE=\u633F\u5165\u307E\u305F\u306F\u66F4\u65B0
+DATA_ACTION.ITEM.UPDATE=\u66F4\u65B0
+DATA_ACTION.ITEM.UPDATE_OR_INSERT=\u66F4\u65B0\u307E\u305F\u306F\u633F\u5165
 DATA_ACTION.NAME=\u30C7\u30FC\u30BF\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
 DBNAME.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9
 DIE_ON_ERROR.NAME=\u30A8\u30E9\u30FC\u767A\u751F\u6642\u306B\u5F37\u5236\u7D42\u4E86
 ENCODING.NAME=\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0
 FIELD_OPTIONS.ITEM.DELETE_KEY=\u524A\u9664\u30AD\u30FC
 FIELD_OPTIONS.ITEM.INSERTABLE=\u633F\u5165\u53EF\u80FD
-FIELD_OPTIONS.ITEM.UPDATABLE=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u53EF\u80FD
-FIELD_OPTIONS.ITEM.UPDATE_KEY=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u30AD\u30FC
+FIELD_OPTIONS.ITEM.UPDATABLE=\u66F4\u65B0\u53EF\u80FD
+FIELD_OPTIONS.ITEM.UPDATE_KEY=\u66F4\u65B0\u30AD\u30FC
 FIELD_OPTIONS.NAME=\u30D5\u30A3\u30FC\u30EB\u30C9\u30AA\u30D7\u30B7\u30E7\u30F3
 HELP=org.talend.help.tInformixOutput
 HOST.NAME=\u30DB\u30B9\u30C8
-LONG_NAME=\u30C6\u30FC\u30D6\u30EB\u306B\u884C\u3092\u633F\u5165\u307E\u305F\u306F\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3057\u307E\u3059
+LONG_NAME=\u30C6\u30FC\u30D6\u30EB\u306B\u884C\u3092\u633F\u5165\u307E\u305F\u306F\u66F4\u65B0\u3057\u307E\u3059
 NB_LINE.NAME=\u884C\u6570
 PASS.NAME=\u30D1\u30B9\u30EF\u30FC\u30C9
 PROPERTIES.NAME=\u8FFD\u52A0\u306EJDBC\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC
@@ -45,7 +45,7 @@ SCHEMA_FLOW.NAME=\u30B9\u30AD\u30FC\u30DE
 SCHEMA_REJECT.NAME=\u30B9\u30AD\u30FC\u30DE\u306E\u30EA\u30B8\u30A7\u30AF\u30C8
 STANDARD_SYNTAX.NAME=\u6A19\u6E96SQL\u69CB\u6587\u3092\u751F\u6210
 TABLE.NAME=\u30C6\u30FC\u30D6\u30EB
-TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u3092\u30AF\u30EA\u30A2
+TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u306E\u30AF\u30EA\u30A2
 TABLE_ACTION.ITEM.CREATE=\u30C6\u30FC\u30D6\u30EB\u306E\u4F5C\u6210
 TABLE_ACTION.ITEM.CREATE_IF_NOT_EXISTS=\u5B58\u5728\u3057\u306A\u3044\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210
 TABLE_ACTION.ITEM.DROP_CREATE=\u30C9\u30ED\u30C3\u30D7\u3057\u3066\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210
@@ -60,7 +60,7 @@ ENABLE_DEBUG_MODE.NAME=\u30C7\u30D0\u30C3\u30B0\u30AF\u30A8\u30EA\u30FC\u30E2\u3
 DB_VERSION.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30D0\u30FC\u30B8\u30E7\u30F3
 DB_VERSION.ITEM.V6R1_V7R2=V6R1\u304B\u3089V7R2
 DB_VERSION.ITEM.V7R1_V7R3=V7R1\u304B\u3089V7R3
-NB_LINE_UPDATED.NAME=NB\u884C\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u6E08\u307F
+NB_LINE_UPDATED.NAME=NB\u884C\u66F4\u65B0\u6E08\u307F
 NB_LINE_INSERTED.NAME=NB\u884C\u633F\u5165\u6E08\u307F
 NB_LINE_DELETED.NAME=NB\u884C\u524A\u9664\u6E08\u307F
 PROPERTY.NAME=\u30D7\u30ED\u30D1\u30C6\u30A3\u30BF\u30A4\u30D7

main/plugins/org.talend.designer.components.localprovider/components/tAccessBulkExec/tAccessBulkExec_messages_ja.properties

@@ -9,8 +9,8 @@ PASS.NAME=\u30D1\u30B9\u30EF\u30FC\u30C9
 TABLE.NAME=\u30C6\u30FC\u30D6\u30EB
 USER.NAME=\u30E6\u30FC\u30B6\u30FC\u540D
 TABLE_ACTION.NAME=\u30C6\u30FC\u30D6\u30EB\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
-TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u3092\u30AF\u30EA\u30A2
-TABLE_ACTION.ITEM.TRUNCATE=\u30C6\u30FC\u30D6\u30EB\u3092\u5207\u308A\u6368\u3066
+TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u306E\u30AF\u30EA\u30A2
+TABLE_ACTION.ITEM.TRUNCATE=\u30C6\u30FC\u30D6\u30EB\u306E\u5207\u308A\u6368\u3066
 TABLE_ACTION.ITEM.CREATE=\u30C6\u30FC\u30D6\u30EB\u306E\u4F5C\u6210
 TABLE_ACTION.ITEM.CREATE_IF_NOT_EXISTS=\u5B58\u5728\u3057\u306A\u3044\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210
 TABLE_ACTION.ITEM.DROP_IF_EXISTS_AND_CREATE=\u5B58\u5728\u3059\u308B\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u524A\u9664\u3057\u3066\u4F5C\u6210

main/plugins/org.talend.designer.components.localprovider/components/tAccessOutput/tAccessOutput_messages_ja.properties

@@ -11,15 +11,15 @@ CLEAR_TABLE.NAME=\u30C6\u30FC\u30D6\u30EB\u30C7\u30FC\u30BF\u306E\u30AF\u30EA\u3
 COMMIT_EVERY.NAME=\u30B3\u30DF\u30C3\u30C8\u3059\u308B\u9593\u9694
 DATA_ACTION.ITEM.DELETE=\u524A\u9664
 DATA_ACTION.ITEM.INSERT=\u633F\u5165
-DATA_ACTION.ITEM.INSERT_OR_UPDATE=\u633F\u5165\u307E\u305F\u306F\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
-DATA_ACTION.ITEM.UPDATE=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
-DATA_ACTION.ITEM.UPDATE_OR_INSERT=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u307E\u305F\u306F\u633F\u5165
+DATA_ACTION.ITEM.INSERT_OR_UPDATE=\u633F\u5165\u307E\u305F\u306F\u66F4\u65B0
+DATA_ACTION.ITEM.UPDATE=\u66F4\u65B0
+DATA_ACTION.ITEM.UPDATE_OR_INSERT=\u66F4\u65B0\u307E\u305F\u306F\u633F\u5165
 DATA_ACTION.NAME=\u30C7\u30FC\u30BF\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
 DBNAME.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9
 DIE_ON_ERROR.NAME=\u30A8\u30E9\u30FC\u767A\u751F\u6642\u306B\u5F37\u5236\u7D42\u4E86
 ENCODING.NAME=\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0
 HELP=org.talend.help.tAccessOutput
-LONG_NAME=Access\u30C6\u30FC\u30D6\u30EB\u306B\u884C\u3092\u633F\u5165\u307E\u305F\u306F\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3057\u307E\u3059\u3002
+LONG_NAME=Access\u30C6\u30FC\u30D6\u30EB\u306B\u884C\u3092\u633F\u5165\u307E\u305F\u306F\u66F4\u65B0\u3057\u307E\u3059\u3002
 PASS.NAME=\u30D1\u30B9\u30EF\u30FC\u30C9
 QUERY.NAME=\u30AF\u30A8\u30EA\u30FC
 REJECT.LINK=\u30EA\u30B8\u30A7\u30AF\u30C8
@@ -28,7 +28,7 @@ SCHEMA_FLOW.NAME=\u30B9\u30AD\u30FC\u30DE
 SCHEMA_REJECT.NAME=\u30B9\u30AD\u30FC\u30DE\u306E\u30EA\u30B8\u30A7\u30AF\u30C8
 TABLE.NAME=\u30C6\u30FC\u30D6\u30EB
 USER.NAME=\u30E6\u30FC\u30B6\u30FC\u540D
-TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u3092\u30AF\u30EA\u30A2
+TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u306E\u30AF\u30EA\u30A2
 TABLE_ACTION.ITEM.CREATE=\u30C6\u30FC\u30D6\u30EB\u306E\u4F5C\u6210
 TABLE_ACTION.ITEM.DROP_IF_EXISTS_AND_CREATE=\u5B58\u5728\u3059\u308B\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u524A\u9664\u3057\u3066\u4F5C\u6210
 TABLE_ACTION.ITEM.CREATE_IF_NOT_EXISTS=\u5B58\u5728\u3057\u306A\u3044\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210
@@ -46,13 +46,13 @@ ADD_COLS.ITEM.OPERATOR.ITEM.IS=IS
 ADD_COLS.ITEM.OPERATOR.ITEM.IS_NOT=IS NOT
 USE_FIELD_OPTIONS.NAME=\u30D5\u30A3\u30FC\u30EB\u30C9\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4F7F\u7528
 FIELD_OPTIONS.NAME=\u30D5\u30A3\u30FC\u30EB\u30C9\u30AA\u30D7\u30B7\u30E7\u30F3
-FIELD_OPTIONS.ITEM.UPDATE_KEY=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u30AD\u30FC
+FIELD_OPTIONS.ITEM.UPDATE_KEY=\u66F4\u65B0\u30AD\u30FC
 FIELD_OPTIONS.ITEM.DELETE_KEY=\u524A\u9664\u30AD\u30FC
-FIELD_OPTIONS.ITEM.UPDATABLE=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u53EF\u80FD
+FIELD_OPTIONS.ITEM.UPDATABLE=\u66F4\u65B0\u53EF\u80FD
 FIELD_OPTIONS.ITEM.INSERTABLE=\u633F\u5165\u53EF\u80FD
 ENABLE_DEBUG_MODE.NAME=\u30C7\u30D0\u30C3\u30B0\u30AF\u30A8\u30EA\u30FC\u30E2\u30FC\u30C9
 NB_LINE.NAME=\u884C\u6570
-NB_LINE_UPDATED.NAME=NB\u884C\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u6E08\u307F
+NB_LINE_UPDATED.NAME=NB\u884C\u66F4\u65B0\u6E08\u307F
 NB_LINE_INSERTED.NAME=NB\u884C\u633F\u5165\u6E08\u307F
 NB_LINE_DELETED.NAME=NB\u884C\u524A\u9664\u6E08\u307F
 NB_LINE_REJECTED.NAME=\u30EA\u30B8\u30A7\u30AF\u30C8\u3055\u308C\u305F\u884C\u6570

main/plugins/org.talend.designer.components.localprovider/components/tAccessOutputBulkExec/tAccessOutputBulkExec_messages_ja.properties

@@ -11,7 +11,7 @@ RUN_IF.LINK=If
 RUN_IF.MENU=Run if
 SCHEMA.NAME=\u30B9\u30AD\u30FC\u30DE
 TABLE.NAME=\u30C6\u30FC\u30D6\u30EB
-TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u3092\u30AF\u30EA\u30A2
+TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u306E\u30AF\u30EA\u30A2
 TABLE_ACTION.ITEM.CREATE=\u30C6\u30FC\u30D6\u30EB\u306E\u4F5C\u6210
 TABLE_ACTION.ITEM.CREATE_IF_NOT_EXISTS=\u5B58\u5728\u3057\u306A\u3044\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210
 TABLE_ACTION.ITEM.DROP_IF_EXISTS_AND_CREATE=\u5B58\u5728\u3059\u308B\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u524A\u9664\u3057\u3066\u4F5C\u6210

main/plugins/org.talend.designer.components.localprovider/components/tAmazonAuroraOutput/tAmazonAuroraOutput_messages_ja.properties

@@ -15,20 +15,20 @@ ADD_COLS.ITEM.OPERATOR.ITEM.GREAT_THAN=>
 ADD_COLS.ITEM.OPERATOR.ITEM.GREAT_EQUAL_THAN=>\\=
 ADD_COLS.ITEM.OPERATOR.ITEM.IS=IS
 ADD_COLS.ITEM.OPERATOR.ITEM.IS_NOT=IS NOT
-ADD_COLS.ITEM.UPDATE_KEY=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u306E\u5165\u529B
+ADD_COLS.ITEM.UPDATE_KEY=\u66F4\u65B0\u306E\u5165\u529B
 ADD_COLS.ITEM.DELETE_KEY=\u524A\u9664\u306E\u5165\u529B
-ADD_COLS.ITEM.UPDATABLE=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u53EF\u80FD
+ADD_COLS.ITEM.UPDATABLE=\u66F4\u65B0\u53EF\u80FD
 ADD_COLS.ITEM.INSERTABLE=\u633F\u5165\u53EF\u80FD
 ADD_COLS.NAME=\u8FFD\u52A0\u30AB\u30E9\u30E0
 CLEAR_TABLE.NAME=\u30C6\u30FC\u30D6\u30EB\u30C7\u30FC\u30BF\u306E\u30AF\u30EA\u30A2
 COMMIT_EVERY.NAME=\u30B3\u30DF\u30C3\u30C8\u3059\u308B\u9593\u9694
 DATA_ACTION.ITEM.REPLACE=\u7F6E\u63DB
-DATA_ACTION.ITEM.INSERT_ON_DUPLICATE_KEY_UPDATE=\u91CD\u8907\u3059\u308B\u30AD\u30FC\u304B\u30E6\u30CB\u30FC\u30AF\u306A\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u306B\u633F\u5165\u304B\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
+DATA_ACTION.ITEM.INSERT_ON_DUPLICATE_KEY_UPDATE=\u91CD\u8907\u3059\u308B\u30AD\u30FC\u304B\u30E6\u30CB\u30FC\u30AF\u306A\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u306B\u633F\u5165\u304B\u66F4\u65B0
 DATA_ACTION.ITEM.DELETE=\u524A\u9664
 DATA_ACTION.ITEM.INSERT=\u633F\u5165
-DATA_ACTION.ITEM.INSERT_OR_UPDATE=\u633F\u5165\u307E\u305F\u306F\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
-DATA_ACTION.ITEM.UPDATE=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
-DATA_ACTION.ITEM.UPDATE_OR_INSERT=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u307E\u305F\u306F\u633F\u5165
+DATA_ACTION.ITEM.INSERT_OR_UPDATE=\u633F\u5165\u307E\u305F\u306F\u66F4\u65B0
+DATA_ACTION.ITEM.UPDATE=\u66F4\u65B0
+DATA_ACTION.ITEM.UPDATE_OR_INSERT=\u66F4\u65B0\u307E\u305F\u306F\u633F\u5165
 DATA_ACTION.ITEM.INSERT_IGNORE=\u633F\u5165\u3001\u7121\u8996
 DATA_ACTION.NAME=\u30C7\u30FC\u30BF\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
 DBNAME.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9
@@ -37,7 +37,7 @@ ENCODING.NAME=\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0
 EXTENDINSERT.NAME=\u633F\u5165\u306E\u62E1\u5F35
 HELP=org.talend.help.tAmazonRDSAuroraOutput
 HOST.NAME=\u30DB\u30B9\u30C8
-LONG_NAME=Amazon RDS Aurora\u30C6\u30FC\u30D6\u30EB\u306B\u884C\u3092\u633F\u5165\u3059\u308B\u304B\u3001\u307E\u305F\u306F\u884C\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3057\u307E\u3059
+LONG_NAME=Amazon RDS Aurora\u30C6\u30FC\u30D6\u30EB\u306B\u884C\u3092\u633F\u5165\u3059\u308B\u304B\u3001\u307E\u305F\u306F\u884C\u3092\u66F4\u65B0\u3057\u307E\u3059
 NB_LINE.NAME=\u884C\u6570
 PASS.NAME=\u30D1\u30B9\u30EF\u30FC\u30C9
 PORT.NAME=\u30DD\u30FC\u30C8
@@ -47,8 +47,8 @@ REJECT.MENU=\u30EA\u30B8\u30A7\u30AF\u30C8
 SCHEMA_FLOW.NAME=\u30B9\u30AD\u30FC\u30DE
 SCHEMA_REJECT.NAME=\u30B9\u30AD\u30FC\u30DE\u306E\u30EA\u30B8\u30A7\u30AF\u30C8
 TABLE.NAME=\u30C6\u30FC\u30D6\u30EB
-TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u3092\u30AF\u30EA\u30A2
-TABLE_ACTION.ITEM.TRUNCATE=\u30C6\u30FC\u30D6\u30EB\u3092\u5207\u308A\u6368\u3066
+TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u306E\u30AF\u30EA\u30A2
+TABLE_ACTION.ITEM.TRUNCATE=\u30C6\u30FC\u30D6\u30EB\u306E\u5207\u308A\u6368\u3066
 TABLE_ACTION.ITEM.CREATE=\u30C6\u30FC\u30D6\u30EB\u306E\u4F5C\u6210
 TABLE_ACTION.ITEM.CREATE_IF_NOT_EXISTS=\u5B58\u5728\u3057\u306A\u3044\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210
 TABLE_ACTION.ITEM.DROP_IF_EXISTS_AND_CREATE=\u5B58\u5728\u3059\u308B\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u524A\u9664\u3057\u3066\u4F5C\u6210
@@ -67,16 +67,16 @@ USE_EXTENDED_INSERTS.NAME=\u62E1\u5F35\u633F\u5165\u306E\u4F7F\u7528
 NB_ROWS_PER_INSERT.NAME=\u30A4\u30F3\u30B5\u30FC\u30C8\u6BCE\u306E\u884C\u6570
 USE_FIELD_OPTIONS.NAME=\u30D5\u30A3\u30FC\u30EB\u30C9\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4F7F\u7528
 FIELD_OPTIONS.NAME=\u30D5\u30A3\u30FC\u30EB\u30C9\u30AA\u30D7\u30B7\u30E7\u30F3
-FIELD_OPTIONS.ITEM.UPDATE_KEY=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u306E\u5165\u529B
+FIELD_OPTIONS.ITEM.UPDATE_KEY=\u66F4\u65B0\u306E\u5165\u529B
 FIELD_OPTIONS.ITEM.DELETE_KEY=\u524A\u9664\u306E\u5165\u529B
-FIELD_OPTIONS.ITEM.UPDATABLE=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u53EF\u80FD
+FIELD_OPTIONS.ITEM.UPDATABLE=\u66F4\u65B0\u53EF\u80FD
 FIELD_OPTIONS.ITEM.INSERTABLE=\u633F\u5165\u53EF\u80FD
 PROPERTIES.NAME=\u8FFD\u52A0\u306EJDBC\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC
 ENABLE_DEBUG_MODE.NAME=\u30C7\u30D0\u30C3\u30B0\u30AF\u30A8\u30EA\u30FC\u30E2\u30FC\u30C9
-NB_LINE_UPDATED.NAME=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3055\u308C\u305F\u884C\u6570
+NB_LINE_UPDATED.NAME=\u66F4\u65B0\u3055\u308C\u305F\u884C\u6570
 NB_LINE_INSERTED.NAME=\u633F\u5165\u3055\u308C\u305F\u884C\u6570
 NB_LINE_DELETED.NAME=\u524A\u9664\u3055\u308C\u305F\u884C\u6570
-ON_DUPLICATE_KEY_UPDATE.NAME=\u633F\u5165\u6642\u3001\u30AD\u30FC\u304C\u91CD\u8907\u3057\u305F\u3089\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u30E2\u30FC\u30C9\u3092\u4F7F\u7528
+ON_DUPLICATE_KEY_UPDATE.NAME=\u633F\u5165\u6642\u3001\u30AD\u30FC\u304C\u91CD\u8907\u3057\u305F\u3089\u66F4\u65B0\u30E2\u30FC\u30C9\u3092\u4F7F\u7528
 DUPLICATED_KEYS.NAME=
 DUPLICATED_KEYS.ITEM.DUPLICATED_KEY=\u30AB\u30E9\u30E0
 DUPLICATED_KEYS.ITEM.DUPLICATED_VALUE=\u5024

main/plugins/org.talend.designer.components.localprovider/components/tAmazonEMRListInstances/tAmazonEMRListInstances_java.xml

@@ -231,14 +231,14 @@
 			<IMPORT NAME="aws-java-sdk-1.11.848.jar" MODULE="aws-java-sdk-1.11.848.jar"
 				MVN="mvn:com.amazonaws/aws-java-sdk/1.11.848"
 				REQUIRED="true" />
-			<IMPORT NAME="jackson-core-2.13.2.jar" MODULE="jackson-core-2.13.2.jar"
-				MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2"
+			<IMPORT NAME="jackson-core-2.11.4.jar" MODULE="jackson-core-2.11.4.jar"
+				MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.11.4"
 				REQUIRED="true" />
-			<IMPORT NAME="jackson-databind-2.13.2.2.jar" MODULE="jackson-databind-2.13.2.2.jar"
-				MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.2.2"
+			<IMPORT NAME="jackson-databind-2.11.4.jar" MODULE="jackson-databind-2.11.4.jar"
+				MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.11.4"
 				REQUIRED="true" />
-			<IMPORT NAME="jackson-annotations-2.13.2.jar" MODULE="jackson-annotations-2.13.2.jar"
-				MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.2"
+			<IMPORT NAME="jackson-annotations-2.11.4.jar" MODULE="jackson-annotations-2.11.4.jar"
+				MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.11.4"
 				REQUIRED="true" />
 			<IMPORT NAME="httpcore-4.4.13.jar" MODULE="httpcore-4.4.13.jar"
 				MVN="mvn:org.apache.httpcomponents/httpcore/4.4.13"

main/plugins/org.talend.designer.components.localprovider/components/tAmazonEMRManage/tAmazonEMRManage_java.xml

@@ -558,14 +558,14 @@
 			<IMPORT NAME="aws-java-sdk-1.11.848.jar" MODULE="aws-java-sdk-1.11.848.jar"
 				MVN="mvn:com.amazonaws/aws-java-sdk/1.11.848"
 				REQUIRED="true" />
-			<IMPORT NAME="jackson-core-2.13.2.jar" MODULE="jackson-core-2.13.2.jar"
-				MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2"
+			<IMPORT NAME="jackson-core-2.11.4.jar" MODULE="jackson-core-2.11.4.jar"
+				MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.11.4"
 				REQUIRED="true" />
-			<IMPORT NAME="jackson-databind-2.13.2.2.jar" MODULE="jackson-databind-2.13.2.2.jar"
-				MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.2.2"
+			<IMPORT NAME="jackson-databind-2.11.4.jar" MODULE="jackson-databind-2.11.4.jar"
+				MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.11.4"
 				REQUIRED="true" />
-			<IMPORT NAME="jackson-annotations-2.13.2.jar" MODULE="jackson-annotations-2.13.2.jar"
-				MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.2"
+			<IMPORT NAME="jackson-annotations-2.11.4.jar" MODULE="jackson-annotations-2.11.4.jar"
+				MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.11.4"
 				REQUIRED="true" />
 			<IMPORT NAME="httpcore-4.4.13.jar" MODULE="httpcore-4.4.13.jar"
 				MVN="mvn:org.apache.httpcomponents/httpcore/4.4.13"

main/plugins/org.talend.designer.components.localprovider/components/tAmazonEMRResize/tAmazonEMRResize_java.xml

@@ -288,14 +288,14 @@
 			<IMPORT NAME="aws-java-sdk-1.11.848.jar" MODULE="aws-java-sdk-1.11.848.jar"
 				MVN="mvn:com.amazonaws/aws-java-sdk/1.11.848"
 				REQUIRED="true" />
-			<IMPORT NAME="jackson-core-2.13.2.jar" MODULE="jackson-core-2.13.2.jar"
-				MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2"
+			<IMPORT NAME="jackson-core-2.11.4.jar" MODULE="jackson-core-2.11.4.jar"
+				MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.11.4"
 				REQUIRED="true" />
-			<IMPORT NAME="jackson-databind-2.13.2.2.jar" MODULE="jackson-databind-2.13.2.2.jar"
-				MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.2.2"
+			<IMPORT NAME="jackson-databind-2.11.4.jar" MODULE="jackson-databind-2.11.4.jar"
+				MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.11.4"
 				REQUIRED="true" />
-			<IMPORT NAME="jackson-annotations-2.13.2.jar" MODULE="jackson-annotations-2.13.2.jar"
-				MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.2"
+			<IMPORT NAME="jackson-annotations-2.11.4.jar" MODULE="jackson-annotations-2.11.4.jar"
+				MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.11.4"
 				REQUIRED="true" />
 			<IMPORT NAME="httpcore-4.4.13.jar" MODULE="httpcore-4.4.13.jar"
 				MVN="mvn:org.apache.httpcomponents/httpcore/4.4.13"

main/plugins/org.talend.designer.components.localprovider/components/tAmazonMysqlCommit/tAmazonMysqlCommit_messages_ja.properties

@@ -10,9 +10,9 @@ CLEAR_TABLE.NAME=\u30C6\u30FC\u30D6\u30EB\u30C7\u30FC\u30BF\u306E\u30AF\u30EA\u3
 COMMIT_EVERY.NAME=\u30B3\u30DF\u30C3\u30C8\u3059\u308B\u9593\u9694
 DATA_ACTION.ITEM.DELETE=\u524A\u9664
 DATA_ACTION.ITEM.INSERT=\u633F\u5165
-DATA_ACTION.ITEM.INSERT_OR_UPDATE=\u633F\u5165\u307E\u305F\u306F\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
-DATA_ACTION.ITEM.UPDATE=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
-DATA_ACTION.ITEM.UPDATE_OR_INSERT=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u307E\u305F\u306F\u633F\u5165
+DATA_ACTION.ITEM.INSERT_OR_UPDATE=\u633F\u5165\u307E\u305F\u306F\u66F4\u65B0
+DATA_ACTION.ITEM.UPDATE=\u66F4\u65B0
+DATA_ACTION.ITEM.UPDATE_OR_INSERT=\u66F4\u65B0\u307E\u305F\u306F\u633F\u5165
 DATA_ACTION.NAME=\u30C7\u30FC\u30BF\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
 DBD-ODBC.INFO=ODBC\u306E\u3088\u3046\u306A\u63A5\u7D9A\u3067\u5FC5\u9808
 DBD-Oracle.INFO=Oracle\u3067\u5FC5\u9808
@@ -32,7 +32,7 @@ SCHEMA.NAME=\u30B9\u30AD\u30FC\u30DE
 SQL_SYNTAX.NAME=Sql\u69CB\u6587
 STRING_QUOTE.NAME=\u5F15\u7528\u7B26
 TABLE.NAME=\u30C6\u30FC\u30D6\u30EB
-TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u3092\u30AF\u30EA\u30A2
+TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u306E\u30AF\u30EA\u30A2
 TABLE_ACTION.ITEM.CREATE=\u30C6\u30FC\u30D6\u30EB\u306E\u4F5C\u6210
 TABLE_ACTION.ITEM.CREATE_IF_NOT_EXISTS=\u5B58\u5728\u3057\u306A\u3044\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210
 TABLE_ACTION.ITEM.DROP_CREATE=\u30C9\u30ED\u30C3\u30D7\u3057\u3066\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210

main/plugins/org.talend.designer.components.localprovider/components/tAmazonMysqlOutput/tAmazonMysqlOutput_messages_ja.properties

@@ -15,20 +15,20 @@ ADD_COLS.ITEM.OPERATOR.ITEM.GREAT_THAN=>
 ADD_COLS.ITEM.OPERATOR.ITEM.GREAT_EQUAL_THAN=>\\=
 ADD_COLS.ITEM.OPERATOR.ITEM.IS=IS
 ADD_COLS.ITEM.OPERATOR.ITEM.IS_NOT=IS NOT
-ADD_COLS.ITEM.UPDATE_KEY=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u306E\u5165\u529B
+ADD_COLS.ITEM.UPDATE_KEY=\u66F4\u65B0\u306E\u5165\u529B
 ADD_COLS.ITEM.DELETE_KEY=\u524A\u9664\u306E\u5165\u529B
-ADD_COLS.ITEM.UPDATABLE=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u53EF\u80FD
+ADD_COLS.ITEM.UPDATABLE=\u66F4\u65B0\u53EF\u80FD
 ADD_COLS.ITEM.INSERTABLE=\u633F\u5165\u53EF\u80FD
 ADD_COLS.NAME=\u8FFD\u52A0\u30AB\u30E9\u30E0
 CLEAR_TABLE.NAME=\u30C6\u30FC\u30D6\u30EB\u30C7\u30FC\u30BF\u306E\u30AF\u30EA\u30A2
 COMMIT_EVERY.NAME=\u30B3\u30DF\u30C3\u30C8\u3059\u308B\u9593\u9694
 DATA_ACTION.ITEM.REPLACE=\u7F6E\u63DB
-DATA_ACTION.ITEM.INSERT_ON_DUPLICATE_KEY_UPDATE=\u91CD\u8907\u3059\u308B\u30AD\u30FC\u304B\u30E6\u30CB\u30FC\u30AF\u306A\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u306B\u633F\u5165\u304B\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
+DATA_ACTION.ITEM.INSERT_ON_DUPLICATE_KEY_UPDATE=\u91CD\u8907\u3059\u308B\u30AD\u30FC\u304B\u30E6\u30CB\u30FC\u30AF\u306A\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u306B\u633F\u5165\u304B\u66F4\u65B0
 DATA_ACTION.ITEM.DELETE=\u524A\u9664
 DATA_ACTION.ITEM.INSERT=\u633F\u5165
-DATA_ACTION.ITEM.INSERT_OR_UPDATE=\u633F\u5165\u307E\u305F\u306F\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
-DATA_ACTION.ITEM.UPDATE=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
-DATA_ACTION.ITEM.UPDATE_OR_INSERT=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u307E\u305F\u306F\u633F\u5165
+DATA_ACTION.ITEM.INSERT_OR_UPDATE=\u633F\u5165\u307E\u305F\u306F\u66F4\u65B0
+DATA_ACTION.ITEM.UPDATE=\u66F4\u65B0
+DATA_ACTION.ITEM.UPDATE_OR_INSERT=\u66F4\u65B0\u307E\u305F\u306F\u633F\u5165
 DATA_ACTION.ITEM.INSERT_IGNORE=\u633F\u5165\u3001\u7121\u8996
 DATA_ACTION.NAME=\u30C7\u30FC\u30BF\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
 DBD-ODBC.INFO=ODBC\u306E\u3088\u3046\u306A\u63A5\u7D9A\u3067\u5FC5\u9808
@@ -41,7 +41,7 @@ ENCODING.NAME=\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0
 EXTENDINSERT.NAME=\u633F\u5165\u306E\u62E1\u5F35
 HELP=org.talend.help.tAmazonMysqlOutput
 HOST.NAME=\u30DB\u30B9\u30C8
-LONG_NAME=Amazon RDS MySQL\u30C6\u30FC\u30D6\u30EB\u306B\u884C\u3092\u633F\u5165\u307E\u305F\u306F\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3057\u307E\u3059\u3002
+LONG_NAME=Amazon RDS MySQL\u30C6\u30FC\u30D6\u30EB\u306B\u884C\u3092\u633F\u5165\u307E\u305F\u306F\u66F4\u65B0\u3057\u307E\u3059\u3002
 NB_LINE.NAME=\u884C\u6570
 NULL_CHAR.NAME=Null\u6587\u5B57
 PASS.NAME=\u30D1\u30B9\u30EF\u30FC\u30C9
@@ -54,8 +54,8 @@ SCHEMA_REJECT.NAME=\u30B9\u30AD\u30FC\u30DE\u306E\u30EA\u30B8\u30A7\u30AF\u30C8
 SQL_SYNTAX.NAME=Sql\u69CB\u6587
 STRING_QUOTE.NAME=\u5F15\u7528\u7B26
 TABLE.NAME=\u30C6\u30FC\u30D6\u30EB
-TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u3092\u30AF\u30EA\u30A2
-TABLE_ACTION.ITEM.TRUNCATE=\u30C6\u30FC\u30D6\u30EB\u3092\u5207\u308A\u6368\u3066
+TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u306E\u30AF\u30EA\u30A2
+TABLE_ACTION.ITEM.TRUNCATE=\u30C6\u30FC\u30D6\u30EB\u306E\u5207\u308A\u6368\u3066
 TABLE_ACTION.ITEM.CREATE=\u30C6\u30FC\u30D6\u30EB\u306E\u4F5C\u6210
 TABLE_ACTION.ITEM.CREATE_IF_NOT_EXISTS=\u5B58\u5728\u3057\u306A\u3044\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210
 TABLE_ACTION.ITEM.DROP_IF_EXISTS_AND_CREATE=\u5B58\u5728\u3059\u308B\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u524A\u9664\u3057\u3066\u4F5C\u6210
@@ -74,16 +74,16 @@ USE_EXTENDED_INSERTS.NAME=\u62E1\u5F35\u633F\u5165\u306E\u4F7F\u7528
 NB_ROWS_PER_INSERT.NAME=\u30A4\u30F3\u30B5\u30FC\u30C8\u6BCE\u306E\u884C\u6570
 USE_FIELD_OPTIONS.NAME=\u30D5\u30A3\u30FC\u30EB\u30C9\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4F7F\u7528
 FIELD_OPTIONS.NAME=\u30D5\u30A3\u30FC\u30EB\u30C9\u30AA\u30D7\u30B7\u30E7\u30F3
-FIELD_OPTIONS.ITEM.UPDATE_KEY=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u306E\u5165\u529B
+FIELD_OPTIONS.ITEM.UPDATE_KEY=\u66F4\u65B0\u306E\u5165\u529B
 FIELD_OPTIONS.ITEM.DELETE_KEY=\u524A\u9664\u306E\u5165\u529B
-FIELD_OPTIONS.ITEM.UPDATABLE=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u53EF\u80FD
+FIELD_OPTIONS.ITEM.UPDATABLE=\u66F4\u65B0\u53EF\u80FD
 FIELD_OPTIONS.ITEM.INSERTABLE=\u633F\u5165\u53EF\u80FD
 PROPERTIES.NAME=\u8FFD\u52A0\u306EJDBC\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC
 ENABLE_DEBUG_MODE.NAME=\u30C7\u30D0\u30C3\u30B0\u30AF\u30A8\u30EA\u30FC\u30E2\u30FC\u30C9
-NB_LINE_UPDATED.NAME=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3055\u308C\u305F\u884C\u6570
+NB_LINE_UPDATED.NAME=\u66F4\u65B0\u3055\u308C\u305F\u884C\u6570
 NB_LINE_INSERTED.NAME=\u633F\u5165\u3055\u308C\u305F\u884C\u6570
 NB_LINE_DELETED.NAME=\u524A\u9664\u3055\u308C\u305F\u884C\u6570
-ON_DUPLICATE_KEY_UPDATE.NAME=\u633F\u5165\u6642\u3001\u30AD\u30FC\u304C\u91CD\u8907\u3057\u305F\u3089\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u30E2\u30FC\u30C9\u3092\u4F7F\u7528
+ON_DUPLICATE_KEY_UPDATE.NAME=\u633F\u5165\u6642\u3001\u30AD\u30FC\u304C\u91CD\u8907\u3057\u305F\u3089\u66F4\u65B0\u30E2\u30FC\u30C9\u3092\u4F7F\u7528
 DUPLICATED_KEYS.NAME=
 DUPLICATED_KEYS.ITEM.DUPLICATED_KEY=\u30AB\u30E9\u30E0
 DUPLICATED_KEYS.ITEM.DUPLICATED_VALUE=\u5024

main/plugins/org.talend.designer.components.localprovider/components/tAmazonMysqlRollback/tAmazonMysqlRollback_messages_ja.properties

@@ -10,9 +10,9 @@ CLEAR_TABLE.NAME=\u30C6\u30FC\u30D6\u30EB\u30C7\u30FC\u30BF\u306E\u30AF\u30EA\u3
 COMMIT_EVERY.NAME=\u30B3\u30DF\u30C3\u30C8\u3059\u308B\u9593\u9694
 DATA_ACTION.ITEM.DELETE=\u524A\u9664
 DATA_ACTION.ITEM.INSERT=\u633F\u5165
-DATA_ACTION.ITEM.INSERT_OR_UPDATE=\u633F\u5165\u307E\u305F\u306F\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
-DATA_ACTION.ITEM.UPDATE=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
-DATA_ACTION.ITEM.UPDATE_OR_INSERT=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u307E\u305F\u306F\u633F\u5165
+DATA_ACTION.ITEM.INSERT_OR_UPDATE=\u633F\u5165\u307E\u305F\u306F\u66F4\u65B0
+DATA_ACTION.ITEM.UPDATE=\u66F4\u65B0
+DATA_ACTION.ITEM.UPDATE_OR_INSERT=\u66F4\u65B0\u307E\u305F\u306F\u633F\u5165
 DATA_ACTION.NAME=\u30C7\u30FC\u30BF\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
 DBD-ODBC.INFO=ODBC\u306E\u3088\u3046\u306A\u63A5\u7D9A\u3067\u5FC5\u9808
 DBD-Oracle.INFO=Oracle\u3067\u5FC5\u9808
@@ -32,7 +32,7 @@ SCHEMA.NAME=\u30B9\u30AD\u30FC\u30DE
 SQL_SYNTAX.NAME=Sql\u69CB\u6587
 STRING_QUOTE.NAME=\u5F15\u7528\u7B26
 TABLE.NAME=\u30C6\u30FC\u30D6\u30EB
-TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u3092\u30AF\u30EA\u30A2
+TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u306E\u30AF\u30EA\u30A2
 TABLE_ACTION.ITEM.CREATE=\u30C6\u30FC\u30D6\u30EB\u306E\u4F5C\u6210
 TABLE_ACTION.ITEM.CREATE_IF_NOT_EXISTS=\u5B58\u5728\u3057\u306A\u3044\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210
 TABLE_ACTION.ITEM.DROP_CREATE=\u30C9\u30ED\u30C3\u30D7\u3057\u3066\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210

main/plugins/org.talend.designer.components.localprovider/components/tAmazonOracleCommit/tAmazonOracleCommit_messages_ja.properties

@@ -10,9 +10,9 @@ CLEAR_TABLE.NAME=\u30C6\u30FC\u30D6\u30EB\u30C7\u30FC\u30BF\u306E\u30AF\u30EA\u3
 COMMIT_EVERY.NAME=\u30B3\u30DF\u30C3\u30C8\u3059\u308B\u9593\u9694
 DATA_ACTION.ITEM.DELETE=\u524A\u9664
 DATA_ACTION.ITEM.INSERT=\u633F\u5165
-DATA_ACTION.ITEM.INSERT_OR_UPDATE=\u633F\u5165\u307E\u305F\u306F\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
-DATA_ACTION.ITEM.UPDATE=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
-DATA_ACTION.ITEM.UPDATE_OR_INSERT=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u307E\u305F\u306F\u633F\u5165
+DATA_ACTION.ITEM.INSERT_OR_UPDATE=\u633F\u5165\u307E\u305F\u306F\u66F4\u65B0
+DATA_ACTION.ITEM.UPDATE=\u66F4\u65B0
+DATA_ACTION.ITEM.UPDATE_OR_INSERT=\u66F4\u65B0\u307E\u305F\u306F\u633F\u5165
 DATA_ACTION.NAME=\u30C7\u30FC\u30BF\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
 DBD-ODBC.INFO=ODBC\u306E\u3088\u3046\u306A\u63A5\u7D9A\u3067\u5FC5\u9808
 DBD-Oracle.INFO=Oracle\u3067\u5FC5\u9808
@@ -32,7 +32,7 @@ SCHEMA.NAME=\u30B9\u30AD\u30FC\u30DE
 SQL_SYNTAX.NAME=Sql\u69CB\u6587
 STRING_QUOTE.NAME=\u5F15\u7528\u7B26
 TABLE.NAME=\u30C6\u30FC\u30D6\u30EB
-TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u3092\u30AF\u30EA\u30A2
+TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u306E\u30AF\u30EA\u30A2
 TABLE_ACTION.ITEM.CREATE=\u30C6\u30FC\u30D6\u30EB\u306E\u4F5C\u6210
 TABLE_ACTION.ITEM.CREATE_IF_NOT_EXISTS=\u5B58\u5728\u3057\u306A\u3044\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210
 TABLE_ACTION.ITEM.DROP_CREATE=\u30C9\u30ED\u30C3\u30D7\u3057\u3066\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210

main/plugins/org.talend.designer.components.localprovider/components/tAmazonOracleConnection/tAmazonOracleConnection_messages_ja.properties

@@ -8,7 +8,7 @@ PORT.NAME=\u30DD\u30FC\u30C8
 SCHEMA.NAME=\u30B9\u30AD\u30FC\u30DE
 SCHEMA_DB.NAME=\u30B9\u30AD\u30FC\u30DE
 USER.NAME=\u30E6\u30FC\u30B6\u30FC\u540D
-PRINT_ERROR.NAME=\u5370\u5237\u30A8\u30E9\u30FC("\u633F\u5165\u307E\u305F\u306F\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8"\u3068\u306E\u9593\u306B\u4E92\u63DB\u6027\u304C\u3042\u308A\u307E\u305B\u3093)
+PRINT_ERROR.NAME=\u5370\u5237\u30A8\u30E9\u30FC("\u633F\u5165\u307E\u305F\u306F\u66F4\u65B0"\u3068\u306E\u9593\u306B\u4E92\u63DB\u6027\u304C\u3042\u308A\u307E\u305B\u3093)
 DBD-Oracle.INFO=Oracle\u3067\u5FC5\u9808
 CONNECTION_TYPE.ITEM.ORACLE_SID=Oracle SID
 CONNECTION_TYPE.NAME=\u63A5\u7D9A\u30BF\u30A4\u30D7

main/plugins/org.talend.designer.components.localprovider/components/tAmazonOracleOutput/tAmazonOracleOutput_messages_ja.properties

@@ -22,9 +22,9 @@ CONNECTION_TYPE.ITEM.ORACLE_SID=Oracle SID
 CONNECTION_TYPE.NAME=\u63A5\u7D9A\u30BF\u30A4\u30D7
 DATA_ACTION.ITEM.DELETE=\u524A\u9664
 DATA_ACTION.ITEM.INSERT=\u633F\u5165
-DATA_ACTION.ITEM.INSERT_OR_UPDATE=\u633F\u5165\u307E\u305F\u306F\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
-DATA_ACTION.ITEM.UPDATE=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
-DATA_ACTION.ITEM.UPDATE_OR_INSERT=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u307E\u305F\u306F\u633F\u5165
+DATA_ACTION.ITEM.INSERT_OR_UPDATE=\u633F\u5165\u307E\u305F\u306F\u66F4\u65B0
+DATA_ACTION.ITEM.UPDATE=\u66F4\u65B0
+DATA_ACTION.ITEM.UPDATE_OR_INSERT=\u66F4\u65B0\u307E\u305F\u306F\u633F\u5165
 DATA_ACTION.NAME=\u30C7\u30FC\u30BF\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
 DBD-ODBC.INFO=ODBC\u306E\u3088\u3046\u306A\u63A5\u7D9A\u3067\u5FC5\u9808
 DBD-Oracle.INFO=Oracle\u3067\u5FC5\u9808
@@ -35,7 +35,7 @@ DIE_ON_ERROR.NAME=\u30A8\u30E9\u30FC\u767A\u751F\u6642\u306B\u5F37\u5236\u7D42\u
 ENCODING.NAME=\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0
 HELP=org.talend.help.tAmazonOracleOutput
 HOST.NAME=\u30DB\u30B9\u30C8
-LONG_NAME=Amazon RDS Oracle\u30C6\u30FC\u30D6\u30EB\u306B\u884C\u3092\u633F\u5165\u307E\u305F\u306F\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3057\u307E\u3059\u3002
+LONG_NAME=Amazon RDS Oracle\u30C6\u30FC\u30D6\u30EB\u306B\u884C\u3092\u633F\u5165\u307E\u305F\u306F\u66F4\u65B0\u3057\u307E\u3059\u3002
 NB_LINE.NAME=\u884C\u6570
 NULL_CHAR.NAME=Null\u6587\u5B57
 PASS.NAME=\u30D1\u30B9\u30EF\u30FC\u30C9
@@ -48,8 +48,8 @@ SCHEMA_REJECT.NAME=\u30B9\u30AD\u30FC\u30DE\u306E\u30EA\u30B8\u30A7\u30AF\u30C8
 SQL_SYNTAX.NAME=Sql\u69CB\u6587
 STRING_QUOTE.NAME=\u5F15\u7528\u7B26
 TABLE.NAME=\u30C6\u30FC\u30D6\u30EB
-TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u3092\u30AF\u30EA\u30A2
-TABLE_ACTION.ITEM.TRUNCATE=\u30C6\u30FC\u30D6\u30EB\u3092\u5207\u308A\u6368\u3066
+TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u306E\u30AF\u30EA\u30A2
+TABLE_ACTION.ITEM.TRUNCATE=\u30C6\u30FC\u30D6\u30EB\u306E\u5207\u308A\u6368\u3066
 TABLE_ACTION.ITEM.CREATE=\u30C6\u30FC\u30D6\u30EB\u306E\u4F5C\u6210
 TABLE_ACTION.ITEM.CREATE_IF_NOT_EXISTS=\u5B58\u5728\u3057\u306A\u3044\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210
 TABLE_ACTION.ITEM.DROP_IF_EXISTS_AND_CREATE=\u5B58\u5728\u3059\u308B\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u524A\u9664\u3057\u3066\u4F5C\u6210
@@ -69,9 +69,9 @@ SCHEMA_DB.NAME=Oracle\u30B9\u30AD\u30FC\u30DE
 TABLESCHEMA.NAME=Oracle\u30B9\u30AD\u30FC\u30DE
 USE_FIELD_OPTIONS.NAME=\u30D5\u30A3\u30FC\u30EB\u30C9\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4F7F\u7528
 FIELD_OPTIONS.NAME=\u30D5\u30A3\u30FC\u30EB\u30C9\u30AA\u30D7\u30B7\u30E7\u30F3
-FIELD_OPTIONS.ITEM.UPDATE_KEY=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u306E\u5165\u529B
+FIELD_OPTIONS.ITEM.UPDATE_KEY=\u66F4\u65B0\u306E\u5165\u529B
 FIELD_OPTIONS.ITEM.DELETE_KEY=\u524A\u9664\u306E\u5165\u529B
-FIELD_OPTIONS.ITEM.UPDATABLE=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u53EF\u80FD
+FIELD_OPTIONS.ITEM.UPDATABLE=\u66F4\u65B0\u53EF\u80FD
 FIELD_OPTIONS.ITEM.INSERTABLE=\u633F\u5165\u53EF\u80FD
 LOCAL_SERVICE_NAME.NAME=\u30ED\u30FC\u30AB\u30EB\u30B5\u30FC\u30D3\u30B9\u540D
 CONVERT_COLUMN_TABLE_TO_UPPERCASE.NAME=\u30AB\u30E9\u30E0\u3068\u30C6\u30FC\u30D6\u30EB\u3092\u5927\u6587\u5B57\u306B\u5909\u63DB
@@ -84,7 +84,7 @@ DB_VERSION.ITEM.ORACLE_10=Oracle 10
 DB_VERSION.ITEM.ORACLE_9=Oracle 9
 DB_VERSION.ITEM.ORACLE_8=Oracle 8
 OVERRIDE_NLS_LANG.NAME=\u65E2\u5B58\u306ENLS_LANG\u74B0\u5883\u5909\u6570\u3092\u4E0A\u66F8\u304D
-NB_LINE_UPDATED.NAME=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3055\u308C\u305F\u884C\u6570
+NB_LINE_UPDATED.NAME=\u66F4\u65B0\u3055\u308C\u305F\u884C\u6570
 NB_LINE_INSERTED.NAME=\u633F\u5165\u3055\u308C\u305F\u884C\u6570
 NB_LINE_DELETED.NAME=\u524A\u9664\u3055\u308C\u305F\u884C\u6570
 USE_BATCH_SIZE.NAME=\u30D0\u30C3\u30C1\u30B5\u30A4\u30BA\u3092\u4F7F\u7528

main/plugins/org.talend.designer.components.localprovider/components/tAmazonOracleRow/tAmazonOracleRow_messages_ja.properties

@@ -69,8 +69,8 @@ PROPERTIES.NAME=\u8FFD\u52A0\u306EJDBC\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC
 USE_NB_LINE.NAME=NB_LINE_\u306E\u4F7F\u7528
 USE_NB_LINE.ITEM.NONE=\u306A\u3057
 USE_NB_LINE.ITEM.NB_LINE_INSERTED=\u633F\u5165\u6E08\u307F
-USE_NB_LINE.ITEM.NB_LINE_UPDATED=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u6E08\u307F
+USE_NB_LINE.ITEM.NB_LINE_UPDATED=\u66F4\u65B0\u6E08\u307F
 USE_NB_LINE.ITEM.NB_LINE_DELETED=\u524A\u9664\u6E08\u307F
-NB_LINE_UPDATED.NAME=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3055\u308C\u305F\u884C\u6570
+NB_LINE_UPDATED.NAME=\u66F4\u65B0\u3055\u308C\u305F\u884C\u6570
 NB_LINE_INSERTED.NAME=\u633F\u5165\u3055\u308C\u305F\u884C\u6570
 NB_LINE_DELETED.NAME=\u524A\u9664\u3055\u308C\u305F\u884C\u6570

main/plugins/org.talend.designer.components.localprovider/components/tAmazonRedshiftManage/tAmazonRedshiftManage_java.xml

@@ -348,14 +348,14 @@
 			<IMPORT NAME="aws-java-sdk-1.11.848.jar" MODULE="aws-java-sdk-1.11.848.jar"
 				MVN="mvn:com.amazonaws/aws-java-sdk/1.11.848"
 				REQUIRED="true" />
-			<IMPORT NAME="jackson-core-2.13.2.jar" MODULE="jackson-core-2.13.2.jar"
-				MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2"
+			<IMPORT NAME="jackson-core-2.11.4.jar" MODULE="jackson-core-2.11.4.jar"
+				MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.11.4"
 				REQUIRED="true" />
-			<IMPORT NAME="jackson-databind-2.13.2.2.jar" MODULE="jackson-databind-2.13.2.2.jar"
-				MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.2.2"
+			<IMPORT NAME="jackson-databind-2.11.4.jar" MODULE="jackson-databind-2.11.4.jar"
+				MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.11.4"
 				REQUIRED="true" />
-			<IMPORT NAME="jackson-annotations-2.13.2.jar" MODULE="jackson-annotations-2.13.2.jar"
-				MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.2"
+			<IMPORT NAME="jackson-annotations-2.11.4.jar" MODULE="jackson-annotations-2.11.4.jar"
+				MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.11.4"
 				REQUIRED="true" />
 			<IMPORT NAME="httpcore-4.4.13.jar" MODULE="httpcore-4.4.13.jar"
 				MVN="mvn:org.apache.httpcomponents/httpcore/4.4.13"

main/plugins/org.talend.designer.components.localprovider/components/tAzureSynapseBulkExec/tAzureSynapseBulkExec_java.xml

@@ -383,9 +383,9 @@
 			<IMPORT NAME="Driver-mssql-jdbc" MODULE="mssql-jdbc.jar" MVN="mvn:com.microsoft.sqlserver/mssql-jdbc/actual"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')" />
 			<!--Active directory dependency module: msal4j and transitive -->
 			<IMPORT NAME="msal4j" MODULE="msal4j-1.11.0.jar" MVN="mvn:com.microsoft.azure/msal4j/1.11.0"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
-			<IMPORT NAME="jackson-core" MODULE="jackson-core-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
-			<IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.13.2.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.2.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
-			<IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+			<IMPORT NAME="jackson-core" MODULE="jackson-core-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.12.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+			<IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.12.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+			<IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.12.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
 			<IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-9.7.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/9.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
 			<IMPORT NAME="jcip-annotations" MODULE="jcip-annotations-1.0-1.jar" MVN="mvn:com.github.stephenc.jcip/jcip-annotations/1.0-1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
 			<IMPORT NAME="json-smart" MODULE="json-smart-2.4.7.jar" MVN="mvn:net.minidev/json-smart/2.4.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />

main/plugins/org.talend.designer.components.localprovider/components/tAzureSynapseBulkExec/tAzureSynapseBulkExec_messages_ja.properties

@@ -83,13 +83,13 @@ SQL_SYNTAX.NAME=Sql\u69CB\u6587
 STRINGDELIMITER.NAME=
 STRING_QUOTE.NAME=\u5F15\u7528\u7B26
 TABLE.NAME=\u30C6\u30FC\u30D6\u30EB
-TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u3092\u30AF\u30EA\u30A2
+TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u306E\u30AF\u30EA\u30A2
 TABLE_ACTION.ITEM.CREATE=\u30C6\u30FC\u30D6\u30EB\u306E\u4F5C\u6210
 TABLE_ACTION.ITEM.CREATE_IF_NOT_EXISTS=\u5B58\u5728\u3057\u306A\u3044\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210
 TABLE_ACTION.ITEM.DROP_CREATE=\u30C9\u30ED\u30C3\u30D7\u3057\u3066\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210
 TABLE_ACTION.ITEM.DROP_IF_EXISTS_AND_CREATE=\u5B58\u5728\u3059\u308B\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u524A\u9664\u3057\u3066\u4F5C\u6210
 TABLE_ACTION.ITEM.NONE=\u306A\u3057
-TABLE_ACTION.ITEM.TRUNCATE=\u30C6\u30FC\u30D6\u30EB\u3092\u5207\u308A\u6368\u3066
+TABLE_ACTION.ITEM.TRUNCATE=\u30C6\u30FC\u30D6\u30EB\u306E\u5207\u308A\u6368\u3066
 TABLE_ACTION.NAME=\u30C6\u30FC\u30D6\u30EB\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
 TABLE_OPTION.ITEM.CLUSTERED_COLUMNSTORE_INDEX=\u30AF\u30E9\u30B9\u30BF\u30FC\u5316\u3055\u308C\u305F\u30AB\u30E9\u30E0\u30B9\u30C8\u30A2\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9
 TABLE_OPTION.ITEM.CLUSTERED_INDEX=\u30AF\u30E9\u30B9\u30BF\u30FC\u5316\u3055\u308C\u305F\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9

main/plugins/org.talend.designer.components.localprovider/components/tAzureSynapseConnection/tAzureSynapseConnection_java.xml

@@ -206,9 +206,9 @@
         <IMPORT NAME="slf4j-log4j12-1.7.29.jar" MODULE="slf4j-log4j12-1.7.29.jar" MVN="mvn:org.slf4j/slf4j-log4j12/1.7.29" REQUIRED_IF="(USE_SHARED_CONNECTION == 'true' AND SPECIFY_DATASOURCE_ALIAS=='false')" />
         <!--Active directory dependency module: msal4j and transitive -->
         <IMPORT NAME="msal4j" MODULE="msal4j-1.11.0.jar" MVN="mvn:com.microsoft.azure/msal4j/1.11.0"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
-        <IMPORT NAME="jackson-core" MODULE="jackson-core-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
-        <IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.13.2.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.2.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
-        <IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
+        <IMPORT NAME="jackson-core" MODULE="jackson-core-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.12.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
+        <IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.12.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
+        <IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.12.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
         <IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-9.7.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/9.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
         <IMPORT NAME="jcip-annotations" MODULE="jcip-annotations-1.0-1.jar" MVN="mvn:com.github.stephenc.jcip/jcip-annotations/1.0-1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
         <IMPORT NAME="json-smart" MODULE="json-smart-2.4.7.jar" MVN="mvn:net.minidev/json-smart/2.4.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />

main/plugins/org.talend.designer.components.localprovider/components/tAzureSynapseInput/tAzureSynapseInput_java.xml

@@ -266,9 +266,9 @@
         <IMPORT NAME="Talend_MssqlUtil" MODULE="talend_DB_mssqlUtil-1.4.jar" MVN="mvn:org.talend.components.lib/talend_DB_mssqlUtil/1.4" UrlPath="platform:/plugin/org.talend.libraries.custom/lib/talend_DB_mssqlUtil-1.4.jar" REQUIRED="true" />
         <!--Active directory dependency module: msal4j and transitive -->
         <IMPORT NAME="msal4j" MODULE="msal4j-1.11.0.jar" MVN="mvn:com.microsoft.azure/msal4j/1.11.0"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
-        <IMPORT NAME="jackson-core" MODULE="jackson-core-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
-        <IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.13.2.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.2.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
-        <IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="jackson-core" MODULE="jackson-core-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.12.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.12.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.12.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-9.7.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/9.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="jcip-annotations" MODULE="jcip-annotations-1.0-1.jar" MVN="mvn:com.github.stephenc.jcip/jcip-annotations/1.0-1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="json-smart" MODULE="json-smart-2.4.7.jar" MVN="mvn:net.minidev/json-smart/2.4.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />

main/plugins/org.talend.designer.components.localprovider/components/tAzureSynapseOutput/tAzureSynapseOutput_java.xml

@@ -337,9 +337,9 @@
 			<IMPORT NAME="Driver-mssql-jdbc" MODULE="mssql-jdbc.jar" MVN="mvn:com.microsoft.sqlserver/mssql-jdbc/actual"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')" />
 			<!--Active directory dependency module: msal4j and transitive -->
 			<IMPORT NAME="msal4j" MODULE="msal4j-1.11.0.jar" MVN="mvn:com.microsoft.azure/msal4j/1.11.0"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
-			<IMPORT NAME="jackson-core" MODULE="jackson-core-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
-			<IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.13.2.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.2.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
-			<IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+			<IMPORT NAME="jackson-core" MODULE="jackson-core-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.12.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+			<IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.12.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+			<IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.12.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
 			<IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-9.7.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/9.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
 			<IMPORT NAME="jcip-annotations" MODULE="jcip-annotations-1.0-1.jar" MVN="mvn:com.github.stephenc.jcip/jcip-annotations/1.0-1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
 			<IMPORT NAME="json-smart" MODULE="json-smart-2.4.7.jar" MVN="mvn:net.minidev/json-smart/2.4.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />

main/plugins/org.talend.designer.components.localprovider/components/tAzureSynapseOutput/tAzureSynapseOutput_messages_ja.properties

@@ -21,9 +21,9 @@ COMMIT_EVERY.NAME=\u30B3\u30DF\u30C3\u30C8\u3059\u308B\u9593\u9694
 DATA_ACTION.ITEM.DELETE=\u524A\u9664
 DATA_ACTION.ITEM.INSERT=\u633F\u5165
 DATA_ACTION.ITEM.SINGLE_INSERT=\u5358\u4E00\u633F\u5165\u30AF\u30A8\u30EA\u30FC
-DATA_ACTION.ITEM.INSERT_OR_UPDATE=\u633F\u5165\u307E\u305F\u306F\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
-DATA_ACTION.ITEM.UPDATE=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
-DATA_ACTION.ITEM.UPDATE_OR_INSERT=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u307E\u305F\u306F\u633F\u5165
+DATA_ACTION.ITEM.INSERT_OR_UPDATE=\u633F\u5165\u307E\u305F\u306F\u66F4\u65B0
+DATA_ACTION.ITEM.UPDATE=\u66F4\u65B0
+DATA_ACTION.ITEM.UPDATE_OR_INSERT=\u66F4\u65B0\u307E\u305F\u306F\u633F\u5165
 DATA_ACTION.ITEM.INSERT_IF_NOT_EXIST=\u5B58\u5728\u3057\u306A\u3044\u5834\u5408\u306F\u633F\u5165
 DATA_ACTION.NAME=\u30C7\u30FC\u30BF\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
 DBD-ODBC.INFO=ODBC\u306E\u3088\u3046\u306A\u63A5\u7D9A\u3067\u5FC5\u9808
@@ -38,14 +38,14 @@ DSN.NAME=\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9
 ENCODING.NAME=\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0
 FIELD_OPTIONS.ITEM.DELETE_KEY=\u524A\u9664\u306E\u5165\u529B
 FIELD_OPTIONS.ITEM.INSERTABLE=\u633F\u5165\u53EF\u80FD
-FIELD_OPTIONS.ITEM.UPDATABLE=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u53EF\u80FD
-FIELD_OPTIONS.ITEM.UPDATE_KEY=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u306E\u5165\u529B
+FIELD_OPTIONS.ITEM.UPDATABLE=\u66F4\u65B0\u53EF\u80FD
+FIELD_OPTIONS.ITEM.UPDATE_KEY=\u66F4\u65B0\u306E\u5165\u529B
 FIELD_OPTIONS.NAME=\u30D5\u30A3\u30FC\u30EB\u30C9\u30AA\u30D7\u30B7\u30E7\u30F3
 HELP=org.talend.help.tAzureSynapseOutput
 HOST.NAME=\u30DB\u30B9\u30C8
 IDENTITY_INSERT.NAME=ID\u633F\u5165\u3092\u30AA\u30F3\u306B\u3059\u308B
 INSTANCE.NAME=\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9
-LONG_NAME=MSSQL\u30C6\u30FC\u30D6\u30EB\u306B\u884C\u3092\u633F\u5165\u3059\u308B\u304B\u3001\u307E\u305F\u306F\u884C\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3057\u307E\u3059
+LONG_NAME=MSSQL\u30C6\u30FC\u30D6\u30EB\u306B\u884C\u3092\u633F\u5165\u3059\u308B\u304B\u3001\u307E\u305F\u306F\u884C\u3092\u66F4\u65B0\u3057\u307E\u3059
 NB_LINE.NAME=\u884C\u6570
 NULL_CHAR.NAME=Null\u6587\u5B57
 PASS.NAME=\u30D1\u30B9\u30EF\u30FC\u30C9
@@ -59,8 +59,8 @@ SCHEMA_REJECT.NAME=\u30B9\u30AD\u30FC\u30DE\u306E\u30EA\u30B8\u30A7\u30AF\u30C8
 SQL_SYNTAX.NAME=Sql\u69CB\u6587
 STRING_QUOTE.NAME=\u5F15\u7528\u7B26
 TABLE.NAME=\u30C6\u30FC\u30D6\u30EB
-TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u3092\u30AF\u30EA\u30A2
-TABLE_ACTION.ITEM.TRUNCATE=\u30C6\u30FC\u30D6\u30EB\u3092\u5207\u308A\u6368\u3066
+TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u306E\u30AF\u30EA\u30A2
+TABLE_ACTION.ITEM.TRUNCATE=\u30C6\u30FC\u30D6\u30EB\u306E\u5207\u308A\u6368\u3066
 TABLE_ACTION.ITEM.CREATE=\u30C6\u30FC\u30D6\u30EB\u306E\u4F5C\u6210
 TABLE_ACTION.ITEM.CREATE_IF_NOT_EXISTS=\u5B58\u5728\u3057\u306A\u3044\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210
 TABLE_ACTION.ITEM.DROP_CREATE=\u30C9\u30ED\u30C3\u30D7\u3057\u3066\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210
@@ -75,7 +75,7 @@ SPECIFY_IDENTITY_FIELD.NAME=ID\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u6307\u5B9A
 IDENTITY_FIELD.NAME=ID\u30D5\u30A3\u30FC\u30EB\u30C9
 START_VALUE.NAME=\u958B\u59CB\u5024
 STEP.NAME=\u30B9\u30C6\u30C3\u30D7
-NB_LINE_UPDATED.NAME=NB\u884C\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u6E08\u307F
+NB_LINE_UPDATED.NAME=NB\u884C\u66F4\u65B0\u6E08\u307F
 NB_LINE_INSERTED.NAME=NB\u884C\u633F\u5165\u6E08\u307F
 NB_LINE_DELETED.NAME=NB\u884C\u524A\u9664\u6E08\u307F
 SUPPORT_NULL_WHERE.NAME="SQL WHERE"\u30B9\u30C6\u30FC\u30C8\u30E1\u30F3\u30C8\u3067Null\u3092\u30B5\u30DD\u30FC\u30C8

main/plugins/org.talend.designer.components.localprovider/components/tAzureSynapseRow/tAzureSynapseRow_java.xml

@@ -322,9 +322,9 @@
         <IMPORT NAME="Driver-mssql-jdbc" MODULE="mssql-jdbc.jar" MVN="mvn:com.microsoft.sqlserver/mssql-jdbc/actual"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')" />
         <!--Active directory dependency module: msal4j and transitive -->
         <IMPORT NAME="msal4j" MODULE="msal4j-1.11.0.jar" MVN="mvn:com.microsoft.azure/msal4j/1.11.0"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
-        <IMPORT NAME="jackson-core" MODULE="jackson-core-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
-        <IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.13.2.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.2.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
-        <IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="jackson-core" MODULE="jackson-core-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.12.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.12.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.12.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-9.7.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/9.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="jcip-annotations" MODULE="jcip-annotations-1.0-1.jar" MVN="mvn:com.github.stephenc.jcip/jcip-annotations/1.0-1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="json-smart" MODULE="json-smart-2.4.7.jar" MVN="mvn:net.minidev/json-smart/2.4.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />

main/plugins/org.talend.designer.components.localprovider/components/tBigQueryBulkExec/tBigQueryBulkExec_java.xml

@@ -266,7 +266,7 @@
          <IMPORT NAME="google-http-client-jackson2-1.38.0.jar" MODULE="google-http-client-jackson2-1.38.0.jar" MVN="mvn:com.google.http-client/google-http-client-jackson2/1.38.0"  REQUIRED="true" />
          <IMPORT NAME="guava-30.0-jre.jar" MODULE="guava-30.0-jre.jar" MVN="mvn:com.google.guava/guava/30.0-jre" REQUIRED="true" />
          <IMPORT NAME="failureaccess-1.0.1.jar" MODULE="failureaccess-1.0.1.jar" MVN="mvn:com.google.guava/failureaccess/1.0.1" REQUIRED="true" />
-		<IMPORT NAME="jackson-core-2.13.2.jar" MODULE="jackson-core-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2" REQUIRED="true" />
+		<IMPORT NAME="jackson-core-2.11.4.jar" MODULE="jackson-core-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.11.4" REQUIRED="true" />
 		<!-- REQUIRED FOR GOOGLE STORAGE -->
 		<IMPORT NAME="jets3t-0.9.1" MODULE="jets3t-0.9.1.jar" MVN="mvn:org.talend.libraries/jets3t-0.9.1/6.0.0"  REQUIRED="true" />
 		<IMPORT NAME="commons-logging-1.2" MODULE="commons-logging-1.2.jar" MVN="mvn:commons-logging/commons-logging/1.2" REQUIRED="true" />

main/plugins/org.talend.designer.components.localprovider/components/tBigQueryInput/tBigQueryInput_java.xml

@@ -209,7 +209,7 @@
 		 <IMPORT NAME="google-http-client-jackson2-1.38.0.jar" MODULE="google-http-client-jackson2-1.38.0.jar" MVN="mvn:com.google.http-client/google-http-client-jackson2/1.38.0"  REQUIRED="true" />
 		 <IMPORT NAME="guava-30.0-jre.jar" MODULE="guava-30.0-jre.jar" MVN="mvn:com.google.guava/guava/30.0-jre" REQUIRED="true" />
 		 <IMPORT NAME="failureaccess-1.0.1.jar" MODULE="failureaccess-1.0.1.jar" MVN="mvn:com.google.guava/failureaccess/1.0.1" REQUIRED="true" />
-		<IMPORT NAME="jackson-core-2.13.2.jar" MODULE="jackson-core-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2" REQUIRED="true" />
+		<IMPORT NAME="jackson-core-2.11.4.jar" MODULE="jackson-core-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.11.4" REQUIRED="true" />
 		<IMPORT NAME="google-cloud-bigquery-1.126.3.jar" MODULE="google-cloud-bigquery-1.126.3.jar" MVN="mvn:com.google.cloud/google-cloud-bigquery/1.126.3" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
 
 		<!-- TODO remove it -->

main/plugins/org.talend.designer.components.localprovider/components/tBigQuerySQLRow/tBigQuerySQLRow_java.xml

@@ -195,8 +195,8 @@
             <IMPORT NAME="google-http-client-jackson2-1.38.0.jar" MODULE="google-http-client-jackson2-1.38.0.jar" MVN="mvn:com.google.http-client/google-http-client-jackson2/1.38.0"  REQUIRED="true" />
             <IMPORT NAME="guava-30.0-jre.jar" MODULE="guava-30.0-jre.jar" MVN="mvn:com.google.guava/guava/30.0-jre" REQUIRED="true"/>
             <IMPORT NAME="failureaccess-1.0.1.jar" MODULE="failureaccess-1.0.1.jar" MVN="mvn:com.google.guava/failureaccess/1.0.1" REQUIRED="true" />
-            <IMPORT NAME="jackson-core-2.13.2.jar" MODULE="jackson-core-2.13.2.jar"
-                    MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2" REQUIRED="true"/>
+            <IMPORT NAME="jackson-core-2.11.4.jar" MODULE="jackson-core-2.11.4.jar"
+                    MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.11.4" REQUIRED="true"/>
             <IMPORT NAME="google-cloud-bigquery-1.126.3.jar" MODULE="google-cloud-bigquery-1.126.3.jar"
                     MVN="mvn:com.google.cloud/google-cloud-bigquery/1.126.3"
                     REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'"/>

main/plugins/org.talend.designer.components.localprovider/components/tBoxConnection/tBoxConnection_java.xml

@@ -72,13 +72,13 @@
                 MODULE="boxjavalibv2-v3.0.10.jar" MVN="mvn:net.box/boxjavalibv2/v3.0.10"
                 REQUIRED="true" />
             <IMPORT NAME="jackson-core"
-                MODULE="jackson-core-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2"
+                MODULE="jackson-core-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.11.4" 
                 REQUIRED="true" />
             <IMPORT NAME="jackson-databind"
-                MODULE="jackson-databind-2.13.2.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.2.2"
+                MODULE="jackson-databind-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.11.4" 
                 REQUIRED="true" />
             <IMPORT NAME="jackson-annotations"
-                MODULE="jackson-annotations-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.2"
+                MODULE="jackson-annotations-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.11.4" 
                 REQUIRED="true" />
             <IMPORT NAME="apache-http-client"
                 MODULE="httpclient-4.5.13.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.13"

main/plugins/org.talend.designer.components.localprovider/components/tBoxConnection/tBoxConnection_messages_ja.properties

@@ -5,7 +5,7 @@ CLIENT_SECRET.NAME=\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8\u30B7\u30FC\u30AF\u30EC\
 ACCESS_TOKEN.NAME=\u30A2\u30AF\u30BB\u30B9\u30C8\u30FC\u30AF\u30F3
 TOKEN_TYPE.NAME=\u30C8\u30FC\u30AF\u30F3\u306E\u30BF\u30A4\u30D7
 EXPIRES_IN.NAME=\u6709\u52B9\u671F\u9650
-REFRESH_TOKEN.NAME=\u30C8\u30FC\u30AF\u30F3\u3092\u66F4\u65B0
+REFRESH_TOKEN.NAME=\u30C8\u30FC\u30AF\u30F3\u306E\u66F4\u65B0
 USE_PROXY.NAME=HTTP\u30D7\u30ED\u30AD\u30B7\u3092\u4F7F\u7528
 PROXY_HOST.NAME=\u30D7\u30ED\u30AD\u30B7\u30DB\u30B9\u30C8
 PROXY_PORT.NAME=\u30D7\u30ED\u30AD\u30B7\u30DD\u30FC\u30C8

main/plugins/org.talend.designer.components.localprovider/components/tBoxCopy/tBoxCopy_java.xml

@@ -127,13 +127,13 @@
                     MODULE="boxjavalibv2-v3.0.10.jar" MVN="mvn:net.box/boxjavalibv2/v3.0.10"
                     REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
                <IMPORT NAME="jackson-core"
-                    MODULE="jackson-core-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2"
+                    MODULE="jackson-core-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.11.4" 
                     REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
                <IMPORT NAME="jackson-databind"
-                    MODULE="jackson-databind-2.13.2.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.2.2"
+                    MODULE="jackson-databind-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.11.4" 
                     REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
                <IMPORT NAME="jackson-annotations"
-                    MODULE="jackson-annotations-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.2"
+                    MODULE="jackson-annotations-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.11.4" 
                     REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
                <IMPORT NAME="apache-http-client"
                 	MODULE="httpclient-4.5.13.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.13"

main/plugins/org.talend.designer.components.localprovider/components/tBoxCopy/tBoxCopy_messages_ja.properties

@@ -4,7 +4,7 @@ CLIENT_SECRET.NAME=\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8\u30B7\u30FC\u30AF\u30EC\
 ACCESS_TOKEN.NAME=\u30A2\u30AF\u30BB\u30B9\u30C8\u30FC\u30AF\u30F3
 TOKEN_TYPE.NAME=\u30C8\u30FC\u30AF\u30F3\u306E\u30BF\u30A4\u30D7
 EXPIRES_IN.NAME=\u6709\u52B9\u671F\u9650
-REFRESH_TOKEN.NAME=\u30C8\u30FC\u30AF\u30F3\u3092\u66F4\u65B0
+REFRESH_TOKEN.NAME=\u30C8\u30FC\u30AF\u30F3\u306E\u66F4\u65B0
 LONG_NAME=\u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30FC\u3092AppBox\u304B\u3089\u30B3\u30D4\u30FC
 CONNECTION.NAME=
 OUTPUT_PATH.NAME=\u4FDD\u5B58\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB\u30D1\u30B9

main/plugins/org.talend.designer.components.localprovider/components/tBoxDelete/tBoxDelete_java.xml

@@ -88,13 +88,13 @@
                     MODULE="boxjavalibv2-v3.0.10.jar" MVN="mvn:net.box/boxjavalibv2/v3.0.10"
                     REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
                <IMPORT NAME="jackson-core"
-                    MODULE="jackson-core-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2"
+                    MODULE="jackson-core-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.11.4" 
                     REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
                <IMPORT NAME="jackson-databind"
-                    MODULE="jackson-databind-2.13.2.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.2.2"
+                    MODULE="jackson-databind-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.11.4" 
                     REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
                <IMPORT NAME="jackson-annotations"
-                    MODULE="jackson-annotations-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.2"
+                    MODULE="jackson-annotations-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.11.4" 
                     REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
                <IMPORT NAME="apache-http-client"
                 	MODULE="httpclient-4.5.13.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.13"

main/plugins/org.talend.designer.components.localprovider/components/tBoxDelete/tBoxDelete_messages_ja.properties

@@ -4,7 +4,7 @@ CLIENT_SECRET.NAME=\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8\u30B7\u30FC\u30AF\u30EC\
 ACCESS_TOKEN.NAME=\u30A2\u30AF\u30BB\u30B9\u30C8\u30FC\u30AF\u30F3
 TOKEN_TYPE.NAME=\u30C8\u30FC\u30AF\u30F3\u306E\u30BF\u30A4\u30D7
 EXPIRES_IN.NAME=\u6709\u52B9\u671F\u9650
-REFRESH_TOKEN.NAME=\u30C8\u30FC\u30AF\u30F3\u3092\u66F4\u65B0
+REFRESH_TOKEN.NAME=\u30C8\u30FC\u30AF\u30F3\u306E\u66F4\u65B0
 LONG_NAME=\u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30FC\u3092AppBox\u304B\u3089\u524A\u9664
 CONNECTION.NAME=
 PATH.NAME=\u30D1\u30B9

main/plugins/org.talend.designer.components.localprovider/components/tBoxGet/tBoxGet_java.xml

@@ -98,13 +98,13 @@
                     MODULE="boxjavalibv2-v3.0.10.jar" MVN="mvn:net.box/boxjavalibv2/v3.0.10"
                     REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
                <IMPORT NAME="jackson-core"
-                    MODULE="jackson-core-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2"
+                    MODULE="jackson-core-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.11.4" 
                     REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
                <IMPORT NAME="jackson-databind"
-                    MODULE="jackson-databind-2.13.2.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.2.2"
+                    MODULE="jackson-databind-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.11.4" 
                     REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
                <IMPORT NAME="jackson-annotations"
-                    MODULE="jackson-annotations-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.2"
+                    MODULE="jackson-annotations-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.11.4" 
                     REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
                <IMPORT NAME="apache-http-client"
                 	MODULE="httpclient-4.5.13.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.13"

main/plugins/org.talend.designer.components.localprovider/components/tBoxGet/tBoxGet_messages_ja.properties

@@ -4,7 +4,7 @@ CLIENT_SECRET.NAME=\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8\u30B7\u30FC\u30AF\u30EC\
 ACCESS_TOKEN.NAME=\u30A2\u30AF\u30BB\u30B9\u30C8\u30FC\u30AF\u30F3
 TOKEN_TYPE.NAME=\u30C8\u30FC\u30AF\u30F3\u306E\u30BF\u30A4\u30D7
 EXPIRES_IN.NAME=\u6709\u52B9\u671F\u9650
-REFRESH_TOKEN.NAME=\u30C8\u30FC\u30AF\u30F3\u3092\u66F4\u65B0
+REFRESH_TOKEN.NAME=\u30C8\u30FC\u30AF\u30F3\u306E\u66F4\u65B0
 LONG_NAME=AppBox\u304B\u3089\u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30FC\u3092\u8AAD\u307F\u53D6\u308A\u307E\u3059
 CONNECTION.NAME=
 PATH.NAME=\u30D1\u30B9

main/plugins/org.talend.designer.components.localprovider/components/tBoxList/tBoxList_java.xml

@@ -106,13 +106,13 @@
                     MODULE="boxjavalibv2-v3.0.10.jar" MVN="mvn:net.box/boxjavalibv2/v3.0.10"
                     REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
                <IMPORT NAME="jackson-core"
-                    MODULE="jackson-core-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2"
+                    MODULE="jackson-core-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.11.4" 
                     REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
                <IMPORT NAME="jackson-databind"
-                    MODULE="jackson-databind-2.13.2.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.2.2"
+                    MODULE="jackson-databind-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.11.4" 
                     REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
                <IMPORT NAME="jackson-annotations"
-                    MODULE="jackson-annotations-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.2"
+                    MODULE="jackson-annotations-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.11.4" 
                     REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
                <IMPORT NAME="apache-http-client"
                 	MODULE="httpclient-4.5.13.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.13"

main/plugins/org.talend.designer.components.localprovider/components/tBoxList/tBoxList_messages_ja.properties

@@ -4,7 +4,7 @@ CLIENT_SECRET.NAME=\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8\u30B7\u30FC\u30AF\u30EC\
 ACCESS_TOKEN.NAME=\u30A2\u30AF\u30BB\u30B9\u30C8\u30FC\u30AF\u30F3
 TOKEN_TYPE.NAME=\u30C8\u30FC\u30AF\u30F3\u306E\u30BF\u30A4\u30D7
 EXPIRES_IN.NAME=\u6709\u52B9\u671F\u9650
-REFRESH_TOKEN.NAME=\u30C8\u30FC\u30AF\u30F3\u3092\u66F4\u65B0
+REFRESH_TOKEN.NAME=\u30C8\u30FC\u30AF\u30F3\u306E\u66F4\u65B0
 LONG_NAME=\u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30FC\u3092AppBox\u304B\u3089\u30EA\u30B9\u30C8\u8868\u793A
 CONNECTION.NAME=
 PATH.NAME=\u30D1\u30B9

main/plugins/org.talend.designer.components.localprovider/components/tBoxPut/tBoxPut_java.xml

@@ -109,13 +109,13 @@
                     MODULE="boxjavalibv2-v3.0.10.jar" MVN="mvn:net.box/boxjavalibv2/v3.0.10"
                     REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
                <IMPORT NAME="jackson-core"
-                    MODULE="jackson-core-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2"
+                    MODULE="jackson-core-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.11.4" 
                     REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
                <IMPORT NAME="jackson-databind"
-                    MODULE="jackson-databind-2.13.2.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.2.2"
+                    MODULE="jackson-databind-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.11.4" 
                     REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
                <IMPORT NAME="jackson-annotations"
-                    MODULE="jackson-annotations-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.2"
+                    MODULE="jackson-annotations-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.11.4" 
                     REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
                <IMPORT NAME="apache-http-client"
                 	MODULE="httpclient-4.5.13.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.13"

main/plugins/org.talend.designer.components.localprovider/components/tBoxPut/tBoxPut_messages_ja.properties

@@ -4,7 +4,7 @@ CLIENT_SECRET.NAME=\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8\u30B7\u30FC\u30AF\u30EC\
 ACCESS_TOKEN.NAME=\u30A2\u30AF\u30BB\u30B9\u30C8\u30FC\u30AF\u30F3
 TOKEN_TYPE.NAME=\u30C8\u30FC\u30AF\u30F3\u306E\u30BF\u30A4\u30D7
 EXPIRES_IN.NAME=\u6709\u52B9\u671F\u9650
-REFRESH_TOKEN.NAME=\u30C8\u30FC\u30AF\u30F3\u3092\u66F4\u65B0
+REFRESH_TOKEN.NAME=\u30C8\u30FC\u30AF\u30F3\u306E\u66F4\u65B0
 LONG_NAME=\u30D5\u30A1\u30A4\u30EB\u3092\u30DC\u30C3\u30AF\u30B9\u306B\u30A2\u30C3\u30D7\u30ED\u30FC\u30C9
 CONNECTION.NAME=
 FILE_PATH.NAME=\u30D5\u30A1\u30A4\u30EB

main/plugins/org.talend.designer.components.localprovider/components/tCombinedSQLOutput/tCombinedSQLOutput_messages_ja.properties

@@ -1,4 +1,4 @@
-LONG_NAME=\u4ED6\u306E\u7D50\u5408SQL\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u3068\u5171\u306B\u4F7F\u7528\u3059\u308B\u3053\u3068\u3067\u3001\u30C6\u30FC\u30D6\u30EB\u306B\u5BFE\u3059\u308B\u30C7\u30FC\u30BF\u306E\u633F\u5165\u3001\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3001\u524A\u9664\u3092\u3057\u307E\u3059\u3002
+LONG_NAME=\u4ED6\u306E\u7D50\u5408SQL\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u3068\u5171\u306B\u4F7F\u7528\u3059\u308B\u3053\u3068\u3067\u3001\u30C6\u30FC\u30D6\u30EB\u306B\u5BFE\u3059\u308B\u30C7\u30FC\u30BF\u306E\u633F\u5165\u3001\u66F4\u65B0\u3001\u524A\u9664\u3092\u3057\u307E\u3059\u3002
 HELP=org.talend.help.tCombinedSQLOutputInsert
 ELTCOMBINE.LINK=\u7D50\u5408
 ELTCOMBINE.MENU=\u7D50\u5408

main/plugins/org.talend.designer.components.localprovider/components/tCreateTable/tCreateTable_java.xml

@@ -257,18 +257,6 @@
 			</ITEMS>
 	</PARAMETER>
 
-	  <PARAMETER
-			  NAME="REDSHIFT_DRIVER_VERSION"
-			  FIELD="CLOSED_LIST"
-			  NUM_ROW="50"
-			  SHOW_IF="(DBTYPE=='REDSHIFT' and USE_EXISTING_CONNECTION=='FALSE')"
-			  REPOSITORY_VALUE="DRIVER_VERSION">
-		  <ITEMS DEFAULT="DRIVER_V2">
-			  <ITEM NAME="DRIVER_V1" VALUE="DRIVER_V1" />
-			  <ITEM NAME="DRIVER_V2" VALUE="DRIVER_V2" />
-		  </ITEMS>
-	  </PARAMETER>
-
 	<PARAMETER
       NAME="CONNECTION_AS400"
       FIELD="COMPONENT_LIST"
@@ -770,32 +758,12 @@
       FIELD="TEXT" 
       NUM_ROW="10" 
       REPOSITORY_VALUE="PROPERTIES_STRING"
-      NOT_SHOW_IF="(DBTYPE=='SQLITE') OR ((DBTYPE=='DBORACLE') AND (CONNECTION_TYPE == 'ORACLE_WALLET')) OR ((DBTYPE=='REDSHIFT')  AND (USE_STRING_PROPERTIES == 'false') AND (REDSHIFT_DRIVER_VERSION == 'DRIVER_V2'))  OR USE_EXISTING_CONNECTION == 'true'"
+      NOT_SHOW_IF="(DBTYPE=='SQLITE') OR ((DBTYPE=='DBORACLE') AND (CONNECTION_TYPE == 'ORACLE_WALLET')) OR USE_EXISTING_CONNECTION == 'true'"
     >
         <DEFAULT IF="((DBTYPE!='AS400') AND (DBTYPE!='MSSQL'))">""</DEFAULT>
         <DEFAULT IF="(DBTYPE=='AS400') OR (DBTYPE=='MSSQL')">"prompt=false"</DEFAULT>
     </PARAMETER>
 
-	  <PARAMETER
-			  NAME="USE_STRING_PROPERTIES"
-			  SHOW_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='REDSHIFT') AND (REDSHIFT_DRIVER_VERSION == 'DRIVER_V2')"
-			  REPOSITORY_VALUE="USE_STRING_PROPERTIES"
-			  FIELD="CHECK"
-			  NUM_ROW="5"
-			  REQUIRED="true"
-	  >
-	  </PARAMETER>
-
-	  <PARAMETER NAME="ENTRY_PROPERTIES" FIELD="TABLE"
-				 SHOW_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='REDSHIFT')  AND (USE_STRING_PROPERTIES == 'false') AND (REDSHIFT_DRIVER_VERSION == 'DRIVER_V2')"
-				 REPOSITORY_VALUE="ENTRY_PROPERTIES"
-				 REQUIRED="false" NUM_ROW="10" NB_LINES="4">
-		  <ITEMS>
-			  <ITEM NAME="KEY" />
-			  <ITEM NAME="VALUE" />
-		  </ITEMS>
-	  </PARAMETER>
-
     <PARAMETER NAME="MSSQL_ACTIVE_DIR_AUTH" FIELD="CHECK" NUM_ROW="12" SHOW_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP')">
         <DEFAULT>false</DEFAULT>
     </PARAMETER>
@@ -848,9 +816,9 @@
 		<IMPORT NAME="Driver-MSSQL-prop" MODULE="mssql-jdbc.jar" MVN="mvn:com.microsoft.sqlserver/mssql-jdbc/actual"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP')" />
 		<!--Active directory dependency module: msal4j and transitive -->
 		<IMPORT NAME="msal4j" MODULE="msal4j-1.11.0.jar" MVN="mvn:com.microsoft.azure/msal4j/1.11.0"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP') AND (MSSQL_ACTIVE_DIR_AUTH == 'true')" />
-		<IMPORT NAME="jackson-core" MODULE="jackson-core-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP') AND (MSSQL_ACTIVE_DIR_AUTH == 'true')" />
-		<IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.13.2.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.2.2"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP') AND (MSSQL_ACTIVE_DIR_AUTH == 'true')" />
-		<IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.2"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP') AND (MSSQL_ACTIVE_DIR_AUTH == 'true')" />
+		<IMPORT NAME="jackson-core" MODULE="jackson-core-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.12.1"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP') AND (MSSQL_ACTIVE_DIR_AUTH == 'true')" />
+		<IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.12.1"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP') AND (MSSQL_ACTIVE_DIR_AUTH == 'true')" />
+		<IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.12.1"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP') AND (MSSQL_ACTIVE_DIR_AUTH == 'true')" />
 		<IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-9.7.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/9.7"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP') AND (MSSQL_ACTIVE_DIR_AUTH == 'true')" />
 		<IMPORT NAME="jcip-annotations" MODULE="jcip-annotations-1.0-1.jar" MVN="mvn:com.github.stephenc.jcip/jcip-annotations/1.0-1"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP') AND (MSSQL_ACTIVE_DIR_AUTH == 'true')" />
 		<IMPORT NAME="json-smart" MODULE="json-smart-2.4.7.jar" MVN="mvn:net.minidev/json-smart/2.4.7"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP') AND (MSSQL_ACTIVE_DIR_AUTH == 'true')" />
@@ -886,12 +854,12 @@
 		<IMPORT NAME="Driver-SYBASE-JCONN3" MODULE="jconn3.jar" MVN="mvn:org.talend.libraries/jconn3/6.0.0" BundleID="" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='SYBASE') AND (DB_SYBASE_VERSION == 'SYBSEIQ_12_15')" />
 		<IMPORT NAME="Driver-SYBASE-JCONN4" MODULE="jconn4.jar" MVN="mvn:org.talend.libraries/jconn4/6.0.0" BundleID="" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='SYBASE') AND (DB_SYBASE_VERSION == 'SYBSEIQ_16')" />
 		<IMPORT NAME="Driver-SqlAnywhere" MODULE="sajdbc4.jar" MVN="mvn:sap.jdbc4.sqlanywhere/sajdbc4/17.0.0"  BundleID="" REQUIRED_IF = "(DB_VERSION == 'SYBSEIQ_16_SA') AND (USE_EXISTING_CONNECTION == 'false')" />
-		<IMPORT NAME="Driver-Teradata" MODULE="terajdbc4-17.10.00.27.jar" MVN="mvn:com.teradata.jdbc/terajdbc4/17.10.00.27" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='TERADATA')" />
+		<IMPORT NAME="Driver-Teradata_jdbc" MODULE="terajdbc4-16.20.00.02.jar" MVN="mvn:com.teradata/terajdbc4/16.20.00.02"   REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='TERADATA')" />
+		<IMPORT NAME="Driver-Teradata_config" MODULE="tdgssconfig-16.20.00.02.jar" MVN="mvn:com.teradata/tdgssconfig/16.20.00.02"   REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='TERADATA')" />
 		<IMPORT NAME="Driver-Netezza" MODULE="nzjdbc.jar" MVN="mvn:org.talend.libraries/nzjdbc/6.0.0"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='NETEZZA')" />
 		
   		<IMPORT NAME="Driver-EXASolution" MODULE="exajdbc-6.0.9302.jar" MVN="mvn:org.talend.libraries/exajdbc-6.0.9302/6.3.0"  REQUIRED_IF="(DBTYPE=='EXASOL') and (USE_EXISTING_CONNECTION == 'false')" />
-		 <IMPORT NAME="Driver-Redshift-v2" MODULE="redshift-jdbc42-2.1.0.3.jar" MVN="mvn:com.amazon.redshift/redshift-jdbc42/2.1.0.3" REQUIRED_IF="(DBTYPE=='REDSHIFT') AND (USE_EXISTING_CONNECTION == 'false') AND (REDSHIFT_DRIVER_VERSION == 'DRIVER_V2')" />
-		 <IMPORT NAME="Driver-Redshift-v1" MODULE="redshift-jdbc42-no-awssdk-1.2.55.1083.jar" MVN="mvn:com.amazon.redshift/redshift-jdbc42-no-awssdk/1.2.55.1083" REQUIRED_IF="(DBTYPE=='REDSHIFT') and (USE_EXISTING_CONNECTION == 'false') AND (REDSHIFT_DRIVER_VERSION == 'DRIVER_V1')" />
+		<IMPORT NAME="Driver-Redshift" MODULE="redshift-jdbc42-no-awssdk-1.2.55.1083.jar" MVN="mvn:com.amazon.redshift/redshift-jdbc42-no-awssdk/1.2.55.1083"  REQUIRED_IF="(DBTYPE=='REDSHIFT') and (USE_EXISTING_CONNECTION == 'false')" />
 		<IMPORT NAME="antlr4-runtime-4.8-1.jar" MODULE="antlr4-runtime-4.8-1.jar" MVN="mvn:org.antlr/antlr4-runtime/4.8-1"  REQUIRED_IF="(DBTYPE=='REDSHIFT') and (USE_EXISTING_CONNECTION == 'false')" />
 		<IMPORT NAME="Driver-Snowflake" MODULE="snowflake-jdbc-3.13.14.jar" MVN="mvn:net.snowflake/snowflake-jdbc/3.13.14"  REQUIRED_IF="(DBTYPE=='SNOWFLAKE') and (USE_EXISTING_CONNECTION == 'false')" />
 		<IMPORT NAME="Driver-VERTICA_9.0" MODULE="vertica-jdbc-9.3.1-0.jar" MVN="mvn:com.vertica/vertica-jdbc/9.3.1-0"   REQUIRED_IF="(DBTYPE=='VERTICA') and (USE_EXISTING_CONNECTION == 'false') and (DB_VERTICA_VERSION=='VERTICA_9_0')"/>

main/plugins/org.talend.designer.components.localprovider/components/tCreateTable/tCreateTable_main.javajet

@@ -1997,51 +1997,12 @@ class RedshiftManager extends Manager {
     public String getSpecificConnectionURL() {
         return "\"jdbc:redshift://\" + " + host + " + \":\" + " + port + " + \"/\" + " + dbName;
     }
-
-        public String getConnectionURL(){
-            boolean useStringProperties = "true".equals(ElementParameterParser.getValue(node, "__USE_STRING_PROPERTIES__"));
-            int driveVersion = "DRIVER_V2".equals(ElementParameterParser.getValue(node, "__REDSHIFT_DRIVER_VERSION__"))? 2 : 1;
-
-            if (getAdditionalParams() == null || "\"\"".equals(getAdditionalParams().trim()) || (!useStringProperties && driveVersion == 2) ){
-                return getSpecificConnectionURL();
-            }else{
-                return getSpecificConnectionURL() + " + \"" + getSeparator() + "\" + " + getAdditionalParams();
-            }
-        }
-
     public String getConnection() {
-        boolean useStringProperties = "true".equals(ElementParameterParser.getValue(node, "__USE_STRING_PROPERTIES__"));
-        int driveVersion = "DRIVER_V2".equals(ElementParameterParser.getValue(node, "__REDSHIFT_DRIVER_VERSION__"))? 2 : 1;
         StringBuilder javaCode = new StringBuilder();
         if(useExistingConnection) {
             javaCode.append(retrieveTable());
             javaCode.append("java.sql.Connection conn_" + cid + " = (java.sql.Connection)globalMap.get(\"conn_" + connection + "\");");
-        } else if(!useStringProperties && driveVersion == 2){
-
-                javaCode.append(retrieveTable());
-                javaCode.append("java.lang.Class jdbcclazz_" + cid + "= java.lang.Class.forName(\"" + getDriver()+ "\");\r\n");
-
-                newInstance(javaCode);
-
-                log4jCodeGenerateUtil.connect_begin();
-                String passwordFieldName = "__PASS__";
-                if(ElementParameterParser.canEncrypt(node, passwordFieldName)) {
-                	javaCode.append("final String decryptedPassword_" + cid + "= routines.system.PasswordEncryptUtil.decryptPassword(" + ElementParameterParser.getEncryptedValue(node, passwordFieldName) + ");\r\n");
-                } else {
-                	javaCode.append("final String decryptedPassword_" + cid + "= " + ElementParameterParser.getValue(node, passwordFieldName) + ";\r\n");
-                }
-                java.util.List<java.util.Map<String, String>> properties = (java.util.List<java.util.Map<String,String>>)ElementParameterParser.getObjectValue(node, "__ENTRY_PROPERTIES__");
-
-
-                javaCode.append("java.util.Properties atnParamsPrope_" + cid + "= new java.util.Properties();\r\n");
-                javaCode.append("atnParamsPrope_" + cid + ".put(\"user\",dbUser_"+ cid + ");\r\n");
-      			javaCode.append("atnParamsPrope_" + cid + ".put(\"password\",decryptedPassword_" + cid + ");\r\n");
-      		    for(java.util.Map<String, String> entry : properties){
-                      javaCode.append("atnParamsPrope_" + cid + ".put(" + entry.get("KEY") + "," + entry.get("VALUE") + ");\r\n");
-                }
-                javaCode.append("java.sql.Connection conn_" + cid + " = java.sql.DriverManager.getConnection(url_" + cid + ", atnParamsPrope_" + cid + ");\r\n");
-
-        }else {
+        } else {
             javaCode.append(super.getConnection());
         }
         return javaCode.toString();

main/plugins/org.talend.designer.components.localprovider/components/tCreateTable/tCreateTable_messages.properties

@@ -137,12 +137,3 @@ ACCOUNT.NAME=Account
 ROLE.NAME=Role
 ENFORCE_DELIMITED_IDENTIFIERS.NAME=Enforce database delimited identifiers
 UNLOGGED.NAME=Unlogged Table
-
-REDSHIFT_DRIVER_VERSION.NAME=Driver version
-REDSHIFT_DRIVER_VERSION.ITEM.DRIVER_V1=Driver v1
-REDSHIFT_DRIVER_VERSION.ITEM.DRIVER_V2=Driver v2
-
-USE_STRING_PROPERTIES.NAME=Use String JDBC parameters
-ENTRY_PROPERTIES.NAME=Additional JDBC Parameters
-ENTRY_PROPERTIES.ITEM.KEY=Key
-ENTRY_PROPERTIES.ITEM.VALUE=Value

main/plugins/org.talend.designer.components.localprovider/components/tCreateTable/tCreateTable_messages_fr.properties

@@ -137,12 +137,3 @@ ACCOUNT.NAME=Compte
 ROLE.NAME=R\u00F4le
 ENFORCE_DELIMITED_IDENTIFIERS.NAME=Impl\u00E9menter les identifiants d\u00E9limit\u00E9s de base de donn\u00E9es
 UNLOGGED.NAME=Table sans log
-
-REDSHIFT_DRIVER_VERSION.NAME=Version du pilote
-REDSHIFT_DRIVER_VERSION.ITEM.DRIVER_V1=Pilote v1
-REDSHIFT_DRIVER_VERSION.ITEM.DRIVER_V2=Pilote v2
-
-USE_STRING_PROPERTIES.NAME=Utiliser des param\u00E8tres de cha\u00EEnes de caract\u00E8res JDBC
-ENTRY_PROPERTIES.NAME=Param\u00E8tres suppl\u00E9mentaires JDBC
-ENTRY_PROPERTIES.ITEM.KEY=Cl\u00E9
-ENTRY_PROPERTIES.ITEM.VALUE=Valeur

main/plugins/org.talend.designer.components.localprovider/components/tCreateTable/tCreateTable_messages_ja.properties

@@ -72,8 +72,8 @@ TLS.NAME=TLS/SSL\u30BD\u30B1\u30C3\u30C8\u3092\u4F7F\u7528
 USER.NAME=\u30E6\u30FC\u30B6\u30FC\u540D
 USE_EXISTING_CONNECTION.NAME=\u65E2\u5B58\u306E\u63A5\u7D9A\u3092\u4F7F\u7528
 TABLE_ACTION.NAME=\u30C6\u30FC\u30D6\u30EB\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
-TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u3092\u30AF\u30EA\u30A2
-TABLE_ACTION.ITEM.TRUNCATE=\u30C6\u30FC\u30D6\u30EB\u3092\u5207\u308A\u6368\u3066
+TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u306E\u30AF\u30EA\u30A2
+TABLE_ACTION.ITEM.TRUNCATE=\u30C6\u30FC\u30D6\u30EB\u306E\u5207\u308A\u6368\u3066
 TABLE_ACTION.ITEM.CREATE=\u30C6\u30FC\u30D6\u30EB\u306E\u4F5C\u6210
 TABLE_ACTION.ITEM.CREATE_IF_NOT_EXISTS=\u5B58\u5728\u3057\u306A\u3044\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210
 TABLE_ACTION.ITEM.DROP_CREATE=\u30C9\u30ED\u30C3\u30D7\u3057\u3066\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210
@@ -137,12 +137,3 @@ ACCOUNT.NAME=\u30A2\u30AB\u30A6\u30F3\u30C8
 ROLE.NAME=\u30ED\u30FC\u30EB
 ENFORCE_DELIMITED_IDENTIFIERS.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u533A\u5207\u308A\u4ED8\u304D\u8B58\u5225\u5B50\u306E\u5F37\u5236
 UNLOGGED.NAME=\u30ED\u30B0\u306A\u3057\u30C6\u30FC\u30D6\u30EB
-
-REDSHIFT_DRIVER_VERSION.NAME=\u30C9\u30E9\u30A4\u30D0\u30FC\u306E\u30D0\u30FC\u30B8\u30E7\u30F3
-REDSHIFT_DRIVER_VERSION.ITEM.DRIVER_V1=\u30C9\u30E9\u30A4\u30D0\u30FCv1
-REDSHIFT_DRIVER_VERSION.ITEM.DRIVER_V2=\u30C9\u30E9\u30A4\u30D0\u30FCv2
-
-USE_STRING_PROPERTIES.NAME=\u6587\u5B57\u5217JDBC\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u3092\u4F7F\u7528
-ENTRY_PROPERTIES.NAME=\u8FFD\u52A0\u306EJDBC\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC
-ENTRY_PROPERTIES.ITEM.KEY=\u30AD\u30FC
-ENTRY_PROPERTIES.ITEM.VALUE=\u5024

main/plugins/org.talend.designer.components.localprovider/components/tCreateTable/tCreateTable_messages_zh_CN.properties

@@ -137,12 +137,3 @@ ACCOUNT.NAME=\u5E10\u6237
 ROLE.NAME=\u89D2\u8272
 ENFORCE_DELIMITED_IDENTIFIERS.NAME=\u6267\u884C\u6570\u636E\u5E93\u5206\u9694\u578B\u6807\u8BC6\u7B26
 UNLOGGED.NAME=\u672A\u8BB0\u5F55\u7684\u8868
-
-REDSHIFT_DRIVER_VERSION.NAME=\u9A71\u52A8\u7248\u672C
-REDSHIFT_DRIVER_VERSION.ITEM.DRIVER_V1=\u9A71\u52A8 v1
-REDSHIFT_DRIVER_VERSION.ITEM.DRIVER_V2=\u9A71\u52A8 v2
-
-USE_STRING_PROPERTIES.NAME=\u4F7F\u7528\u5B57\u4E32 JDBC \u53C2\u6570
-ENTRY_PROPERTIES.NAME=\u9644\u52A0 JDBC \u53C2\u6570
-ENTRY_PROPERTIES.ITEM.KEY=\u952E
-ENTRY_PROPERTIES.ITEM.VALUE=\u503C

main/plugins/org.talend.designer.components.localprovider/components/tDB2BulkExec/tDB2BulkExec_messages_ja.properties

@@ -2,13 +2,13 @@ LONG_NAME=DB2\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306E\u5B9A\u7FA9\u3055\u308C\
 HELP=org.talend.help.tDB2BulkExec
 DATA_ACTION.ITEM.INSERT=\u633F\u5165
 DATA_ACTION.ITEM.REPLACE=\u7F6E\u63DB
-DATA_ACTION.ITEM.UPDATE=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
+DATA_ACTION.ITEM.UPDATE=\u66F4\u65B0
 DATA_ACTION.NAME=\u30C7\u30FC\u30BF\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
 DBNAME.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9
 ENCODING.NAME=\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0
 HOST.NAME=\u30DB\u30B9\u30C8
 NB_LINE.NAME=\u884C\u6570
-NB_LINE_UPDATED.NAME=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3055\u308C\u305F\u884C\u6570
+NB_LINE_UPDATED.NAME=\u66F4\u65B0\u3055\u308C\u305F\u884C\u6570
 NB_LINE_INSERTED.NAME=\u633F\u5165\u3055\u308C\u305F\u884C\u6570
 NB_LINE_DELETED.NAME=\u524A\u9664\u3055\u308C\u305F\u884C\u6570
 NULL_CHAR.NAME=Null\u6587\u5B57
@@ -17,7 +17,7 @@ PORT.NAME=\u30DD\u30FC\u30C8
 QUERY.NAME=\u30AF\u30A8\u30EA\u30FC
 SCHEMA_FLOW.NAME=\u30B9\u30AD\u30FC\u30DE
 TABLE.NAME=\u30C6\u30FC\u30D6\u30EB
-TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u3092\u30AF\u30EA\u30A2
+TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u306E\u30AF\u30EA\u30A2
 TABLE_ACTION.ITEM.CREATE=\u30C6\u30FC\u30D6\u30EB\u306E\u4F5C\u6210
 TABLE_ACTION.ITEM.CREATE_IF_NOT_EXISTS=\u5B58\u5728\u3057\u306A\u3044\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210
 TABLE_ACTION.ITEM.DROP_IF_EXISTS_AND_CREATE=\u5B58\u5728\u3059\u308B\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u524A\u9664\u3057\u3066\u4F5C\u6210
@@ -27,9 +27,9 @@ TABLE_ACTION.NAME=\u30C6\u30FC\u30D6\u30EB\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u
 USER.NAME=\u30E6\u30FC\u30B6\u30FC\u540D
 USE_FIELD_OPTIONS.NAME=\u30D5\u30A3\u30FC\u30EB\u30C9\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4F7F\u7528
 FIELD_OPTIONS.NAME=\u30D5\u30A3\u30FC\u30EB\u30C9\u30AA\u30D7\u30B7\u30E7\u30F3
-FIELD_OPTIONS.ITEM.UPDATE_KEY=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u30AD\u30FC
+FIELD_OPTIONS.ITEM.UPDATE_KEY=\u66F4\u65B0\u30AD\u30FC
 FIELD_OPTIONS.ITEM.DELETE_KEY=\u524A\u9664\u30AD\u30FC
-FIELD_OPTIONS.ITEM.UPDATABLE=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u53EF\u80FD
+FIELD_OPTIONS.ITEM.UPDATABLE=\u66F4\u65B0\u53EF\u80FD
 FIELD_OPTIONS.ITEM.INSERTABLE=\u633F\u5165\u53EF\u80FD
 TABLESCHEMA.NAME=\u30C6\u30FC\u30D6\u30EB\u30B9\u30AD\u30FC\u30DE
 USE_EXISTING_CONNECTION.NAME=\u65E2\u5B58\u306E\u63A5\u7D9A\u3092\u4F7F\u7528
@@ -76,7 +76,7 @@ PROPERTIES.NAME=\u8FFD\u52A0\u306EJDBC\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC
 USE_INGEST_COMMAND.NAME=\u53D6\u308A\u8FBC\u307F\u30B3\u30DE\u30F3\u30C9\u306E\u4F7F\u7528
 DATA_ACTION_TYPE.NAME=\u30C7\u30FC\u30BF\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
 DATA_ACTION_TYPE.ITEM.INSERT=\u633F\u5165
-DATA_ACTION_TYPE.ITEM.UPDATE=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
+DATA_ACTION_TYPE.ITEM.UPDATE=\u66F4\u65B0
 DATA_ACTION_TYPE.ITEM.DELETE=\u524A\u9664
 DATA_ACTION_TYPE.ITEM.REPLACE=\u7F6E\u63DB
 DATA_ACTION_TYPE.ITEM.MERGE=\u30DE\u30FC\u30B8
@@ -137,7 +137,7 @@ EXISTS_IN_TABLE_COLUMN.ITEM.START=\u958B\u59CB\u4F4D\u7F6E
 EXISTS_IN_TABLE_COLUMN.ITEM.END=\u7D42\u4E86\u4F4D\u7F6E
 CUSTOM_INSERT_VALUES_CLAUSE.NAME=\u30AB\u30B9\u30BF\u30E0\u633F\u5165\u5024\u53E5
 WHERE_CLAUSE.NAME=where\u53E5
-CUSTOM_SET_MAPPING.NAME=\u30AB\u30B9\u30BF\u30E0\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u8A2D\u5B9A\u53E5
+CUSTOM_SET_MAPPING.NAME=\u30AB\u30B9\u30BF\u30E0\u66F4\u65B0\u8A2D\u5B9A\u53E5
 SET_MAPPING.NAME=\u30DE\u30C3\u30D4\u30F3\u30B0\u306E\u8A2D\u5B9A
 SET_MAPPING.ITEM.EXPRESSION=\u5F0F
 TARGET_FOLDER.NAME=\u30D5\u30A9\u30EB\u30C0\u30FC

main/plugins/org.talend.designer.components.localprovider/components/tDB2Output/tDB2Output_messages_ja.properties

@@ -20,9 +20,9 @@ CLEAR_TABLE.NAME=\u30C6\u30FC\u30D6\u30EB\u30C7\u30FC\u30BF\u306E\u30AF\u30EA\u3
 COMMIT_EVERY.NAME=\u30B3\u30DF\u30C3\u30C8\u3059\u308B\u9593\u9694
 DATA_ACTION.ITEM.DELETE=\u524A\u9664
 DATA_ACTION.ITEM.INSERT=\u633F\u5165
-DATA_ACTION.ITEM.INSERT_OR_UPDATE=\u633F\u5165\u307E\u305F\u306F\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
-DATA_ACTION.ITEM.UPDATE=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
-DATA_ACTION.ITEM.UPDATE_OR_INSERT=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u307E\u305F\u306F\u633F\u5165
+DATA_ACTION.ITEM.INSERT_OR_UPDATE=\u633F\u5165\u307E\u305F\u306F\u66F4\u65B0
+DATA_ACTION.ITEM.UPDATE=\u66F4\u65B0
+DATA_ACTION.ITEM.UPDATE_OR_INSERT=\u66F4\u65B0\u307E\u305F\u306F\u633F\u5165
 DATA_ACTION.NAME=\u30C7\u30FC\u30BF\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
 DBD-ODBC.INFO=ODBC\u306E\u3088\u3046\u306A\u63A5\u7D9A\u3067\u5FC5\u9808
 DBD-Oracle.INFO=Oracle\u3067\u5FC5\u9808
@@ -33,7 +33,7 @@ DIE_ON_ERROR.NAME=\u30A8\u30E9\u30FC\u767A\u751F\u6642\u306B\u5F37\u5236\u7D42\u
 ENCODING.NAME=\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0
 HELP=org.talend.help.tDB2Output
 HOST.NAME=\u30DB\u30B9\u30C8
-LONG_NAME=DB2\u30C6\u30FC\u30D6\u30EB\u306B\u884C\u3092\u633F\u5165\u307E\u305F\u306F\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
+LONG_NAME=DB2\u30C6\u30FC\u30D6\u30EB\u306B\u884C\u3092\u633F\u5165\u307E\u305F\u306F\u66F4\u65B0
 NB_LINE.NAME=\u884C\u6570
 NULL_CHAR.NAME=Null\u6587\u5B57
 PASS.NAME=\u30D1\u30B9\u30EF\u30FC\u30C9
@@ -46,8 +46,8 @@ SCHEMA_REJECT.NAME=\u30B9\u30AD\u30FC\u30DE\u306E\u30EA\u30B8\u30A7\u30AF\u30C8
 SQL_SYNTAX.NAME=Sql\u69CB\u6587
 STRING_QUOTE.NAME=\u5F15\u7528\u7B26
 TABLE.NAME=\u30C6\u30FC\u30D6\u30EB
-TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u3092\u30AF\u30EA\u30A2
-TABLE_ACTION.ITEM.TRUNCATE=\u30C6\u30FC\u30D6\u30EB\u3092\u5207\u308A\u6368\u3066
+TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u306E\u30AF\u30EA\u30A2
+TABLE_ACTION.ITEM.TRUNCATE=\u30C6\u30FC\u30D6\u30EB\u306E\u5207\u308A\u6368\u3066
 TABLE_ACTION.ITEM.TRUNCATE_REUSE_STORAGE=Truncate table with reuse storage
 TABLE_ACTION.ITEM.CREATE=\u30C6\u30FC\u30D6\u30EB\u306E\u4F5C\u6210
 TABLE_ACTION.ITEM.CREATE_IF_NOT_EXISTS=\u5B58\u5728\u3057\u306A\u3044\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210
@@ -64,15 +64,15 @@ TYPE.NAME=
 USER.NAME=\u30E6\u30FC\u30B6\u30FC\u540D
 USE_FIELD_OPTIONS.NAME=\u30D5\u30A3\u30FC\u30EB\u30C9\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4F7F\u7528
 FIELD_OPTIONS.NAME=\u30D5\u30A3\u30FC\u30EB\u30C9\u30AA\u30D7\u30B7\u30E7\u30F3
-FIELD_OPTIONS.ITEM.UPDATE_KEY=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u30AD\u30FC
+FIELD_OPTIONS.ITEM.UPDATE_KEY=\u66F4\u65B0\u30AD\u30FC
 FIELD_OPTIONS.ITEM.DELETE_KEY=\u524A\u9664\u30AD\u30FC
-FIELD_OPTIONS.ITEM.UPDATABLE=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u53EF\u80FD
+FIELD_OPTIONS.ITEM.UPDATABLE=\u66F4\u65B0\u53EF\u80FD
 FIELD_OPTIONS.ITEM.INSERTABLE=\u633F\u5165\u53EF\u80FD
 TABLESCHEMA.NAME=\u30C6\u30FC\u30D6\u30EB\u30B9\u30AD\u30FC\u30DE
 USE_EXISTING_CONNECTION.NAME=\u65E2\u5B58\u306E\u63A5\u7D9A\u3092\u4F7F\u7528
 CONVERT_COLUMN_TABLE_TO_UPPERCASE.NAME=\u30AB\u30E9\u30E0\u540D\u3068\u30C6\u30FC\u30D6\u30EB\u540D\u3092\u5927\u6587\u5B57\u306B\u5909\u63DB
 ENABLE_DEBUG_MODE.NAME=\u30C7\u30D0\u30C3\u30B0\u30AF\u30A8\u30EA\u30FC\u30E2\u30FC\u30C9
-NB_LINE_UPDATED.NAME=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3055\u308C\u305F\u884C\u6570
+NB_LINE_UPDATED.NAME=\u66F4\u65B0\u3055\u308C\u305F\u884C\u6570
 NB_LINE_INSERTED.NAME=\u633F\u5165\u3055\u308C\u305F\u884C\u6570
 NB_LINE_DELETED.NAME=\u524A\u9664\u3055\u308C\u305F\u884C\u6570
 SCHEMA_DB.NAME=\u30B9\u30AD\u30FC\u30DE

main/plugins/org.talend.designer.components.localprovider/components/tDB2SCD/tDB2SCD_messages_ja.properties

@@ -10,9 +10,9 @@ CLEAR_TABLE.NAME=\u30C6\u30FC\u30D6\u30EB\u30C7\u30FC\u30BF\u306E\u30AF\u30EA\u3
 COMMIT_EVERY.NAME=\u30B3\u30DF\u30C3\u30C8\u3059\u308B\u9593\u9694
 DATA_ACTION.ITEM.DELETE=\u524A\u9664
 DATA_ACTION.ITEM.INSERT=\u633F\u5165
-DATA_ACTION.ITEM.INSERT_OR_UPDATE=\u633F\u5165\u307E\u305F\u306F\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
-DATA_ACTION.ITEM.UPDATE=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
-DATA_ACTION.ITEM.UPDATE_OR_INSERT=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u307E\u305F\u306F\u633F\u5165
+DATA_ACTION.ITEM.INSERT_OR_UPDATE=\u633F\u5165\u307E\u305F\u306F\u66F4\u65B0
+DATA_ACTION.ITEM.UPDATE=\u66F4\u65B0
+DATA_ACTION.ITEM.UPDATE_OR_INSERT=\u66F4\u65B0\u307E\u305F\u306F\u633F\u5165
 DATA_ACTION.NAME=\u30C7\u30FC\u30BF\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
 DBD-ODBC.INFO=ODBC\u306E\u3088\u3046\u306A\u63A5\u7D9A\u3067\u5FC5\u9808
 DBD-Oracle.INFO=Oracle\u3067\u5FC5\u9808
@@ -73,11 +73,11 @@ L3_FIELDS.ITEM.CURRENT_VALUE=\u73FE\u5728\u5024\u30D5\u30A3\u30FC\u30EB\u30C9
 L3_FIELDS.ITEM.PREV_VALUE=\u524D\u56DE\u5024\u30D5\u30A3\u30FC\u30EB\u30C9
 DEBUG.NAME=\u30C7\u30D0\u30C3\u30B0\u30E2\u30FC\u30C9
 TABLESCHEMA.NAME=\u30C6\u30FC\u30D6\u30EB\u30B9\u30AD\u30FC\u30DE
-ONLY_UPDATE_ACTIVE.NAME=\u30A2\u30AF\u30C6\u30A3\u30D6\u306A\u30EC\u30B3\u30FC\u30C9\u306E\u307F\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
+ONLY_UPDATE_ACTIVE.NAME=\u30A2\u30AF\u30C6\u30A3\u30D6\u306A\u30EC\u30B3\u30FC\u30C9\u306E\u307F\u3092\u66F4\u65B0
 USE_EXISTING_CONNECTION.NAME=\u65E2\u5B58\u306E\u63A5\u7D9A\u3092\u4F7F\u7528
 USE_SAVE_MEM_MODE.NAME=\u30E1\u30E2\u30EA\u7BC0\u7D04\u30E2\u30FC\u30C9\u3092\u4F7F\u7528
 MAP.NAME=SCD\u30A8\u30C7\u30A3\u30BF
-NB_LINE_UPDATED.NAME=NB\u884C\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u6E08\u307F
+NB_LINE_UPDATED.NAME=NB\u884C\u66F4\u65B0\u6E08\u307F
 NB_LINE_INSERTED.NAME=NB\u884C\u633F\u5165\u6E08\u307F
 NB_LINE_REJECTED.NAME=\u30EA\u30B8\u30A7\u30AF\u30C8\u3055\u308C\u305F\u884C\u6570
 PROPERTY_DB.NAME=\u30D7\u30ED\u30D1\u30C6\u30A3\u30BF\u30A4\u30D7

main/plugins/org.talend.designer.components.localprovider/components/tDB2SCDELT/tDB2SCDELT_messages_ja.properties

@@ -25,8 +25,8 @@ PORT.NAME=\u30DD\u30FC\u30C8
 SCHEMA.NAME=\u30B9\u30AD\u30FC\u30DE
 TABLE.NAME=\u30C6\u30FC\u30D6\u30EB
 TABLE_SRC.NAME=\u30BD\u30FC\u30B9\u30C6\u30FC\u30D6\u30EB
-TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u3092\u30AF\u30EA\u30A2
-TABLE_ACTION.ITEM.TRUNCATE=\u30C6\u30FC\u30D6\u30EB\u3092\u5207\u308A\u6368\u3066
+TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u306E\u30AF\u30EA\u30A2
+TABLE_ACTION.ITEM.TRUNCATE=\u30C6\u30FC\u30D6\u30EB\u306E\u5207\u308A\u6368\u3066
 TABLE_ACTION.ITEM.CREATE=\u30C6\u30FC\u30D6\u30EB\u306E\u4F5C\u6210
 TABLE_ACTION.ITEM.CREATE_IF_NOT_EXISTS=\u5B58\u5728\u3057\u306A\u3044\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210
 TABLE_ACTION.ITEM.DROP_IF_EXISTS_AND_CREATE=\u5B58\u5728\u3059\u308B\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u524A\u9664\u3057\u3066\u4F5C\u6210

main/plugins/org.talend.designer.components.localprovider/components/tDropboxConnection/tDropboxConnection_java.xml

@@ -61,7 +61,7 @@
                     MODULE="dropbox-core-sdk-2.1.2.jar" MVN="mvn:org.talend.libraries/dropbox-core-sdk-2.1.2/6.3.0" 
                     REQUIRED="true" />
                <IMPORT NAME="jackson-core"
-                    MODULE="jackson-core-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2"
+                    MODULE="jackson-core-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.11.4" 
                     REQUIRED="true" />
 		</IMPORTS>
    </CODEGENERATION>

main/plugins/org.talend.designer.components.localprovider/components/tDropboxDelete/tDropboxDelete_java.xml

@@ -71,7 +71,7 @@
                     MODULE="dropbox-core-sdk-2.1.2.jar" MVN="mvn:org.talend.libraries/dropbox-core-sdk-2.1.2/6.3.0" 
                     REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
                <IMPORT NAME="jackson-core"
-                    MODULE="jackson-core-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2"
+                    MODULE="jackson-core-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.11.4" 
                     REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
 		</IMPORTS>
    </CODEGENERATION>

main/plugins/org.talend.designer.components.localprovider/components/tDropboxGet/tDropboxGet_java.xml

@@ -85,7 +85,7 @@
                     MODULE="dropbox-core-sdk-2.1.2.jar" MVN="mvn:org.talend.libraries/dropbox-core-sdk-2.1.2/6.3.0" 
                     REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
                <IMPORT NAME="jackson-core"
-                    MODULE="jackson-core-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2"
+                    MODULE="jackson-core-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.11.4" 
                     REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
 		</IMPORTS>
    </CODEGENERATION>

main/plugins/org.talend.designer.components.localprovider/components/tDropboxList/tDropboxList_java.xml

@@ -83,7 +83,7 @@
                     MODULE="dropbox-core-sdk-2.1.2.jar" MVN="mvn:org.talend.libraries/dropbox-core-sdk-2.1.2/6.3.0" 
                     REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
                <IMPORT NAME="jackson-core"
-                    MODULE="jackson-core-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2"
+                    MODULE="jackson-core-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.11.4" 
                     REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
 		</IMPORTS>
    </CODEGENERATION>

main/plugins/org.talend.designer.components.localprovider/components/tDropboxPut/tDropboxPut_java.xml

@@ -110,7 +110,7 @@
                     MODULE="dropbox-core-sdk-2.1.2.jar" MVN="mvn:org.talend.libraries/dropbox-core-sdk-2.1.2/6.3.0" 
                     REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
                <IMPORT NAME="jackson-core"
-                    MODULE="jackson-core-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2"
+                    MODULE="jackson-core-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.11.4" 
                     REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
 		</IMPORTS>
    </CODEGENERATION>

main/plugins/org.talend.designer.components.localprovider/components/tDropboxPut/tDropboxPut_messages_ja.properties

@@ -8,7 +8,7 @@ ACCESS_TOKEN.NAME=\u30A2\u30AF\u30BB\u30B9\u30C8\u30FC\u30AF\u30F3
 MODE_GROUP.NAME=\u30A2\u30C3\u30D7\u30ED\u30FC\u30C9\u30E2\u30FC\u30C9
 ADD_MODE.NAME=\u91CD\u8907\u3059\u308B\u5834\u5408\u30EA\u30CD\u30FC\u30E0
 FORCE_MODE.NAME=\u5B58\u5728\u3059\u308B\u5834\u5408\u306F\u7F6E\u63DB
-UPDATE_MODE.NAME=\u6307\u5B9A\u3057\u305F\u30EA\u30D3\u30B8\u30E7\u30F3\u306E\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
+UPDATE_MODE.NAME=\u6307\u5B9A\u3057\u305F\u30EA\u30D3\u30B8\u30E7\u30F3\u306E\u66F4\u65B0
 REVISION.NAME=\u30EA\u30D3\u30B8\u30E7\u30F3
 EXPOSE_OUTPUT_STREAM.NAME=OutputStream\u3068\u3057\u3066\u516C\u958B
 OUTPUTSTREAM.NAME=OutputStream

main/plugins/org.talend.designer.components.localprovider/components/tELTGreenplumOutput/tELTGreenplumOutput_messages_ja.properties

@@ -1,6 +1,6 @@
 DATA_ACTION.ITEM.DELETE=\u524A\u9664
 DATA_ACTION.ITEM.INSERT=\u633F\u5165
-DATA_ACTION.ITEM.UPDATE=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
+DATA_ACTION.ITEM.UPDATE=\u66F4\u65B0
 DATA_ACTION.NAME=\u30C7\u30FC\u30BF\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
 HELP=org.talend.help.tELTGreenplumOutput
 LONG_NAME=tELTGreenplumMap\u3067\u69CB\u7BC9\u3055\u308C\u305F\u9078\u629E\u30AF\u30A8\u30EA\u30FC\u304B\u3089\u633F\u5165\u30AF\u30A8\u30EA\u30FC\u3092\u5B9F\u884C\u3057\u307E\u3059
@@ -9,12 +9,12 @@ SCHEMA.NAME=\u30B9\u30AD\u30FC\u30DE
 WHERE_CLAUSE.NAME=WHERE\u53E5 \n(UPDATE\u3068DELETE\u306E\u5834\u5408\u306E\u307F)
 ELT_TABLE_NAME.NAME=\u30C7\u30D5\u30A9\u30EB\u30C8\u30C6\u30FC\u30D6\u30EB\u540D
 ELT_SCHEMA_NAME.NAME=\u30C7\u30D5\u30A9\u30EB\u30C8\u30B9\u30AD\u30FC\u30DE
-NB_LINE_UPDATED.NAME=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3055\u308C\u305F\u884C\u6570
+NB_LINE_UPDATED.NAME=\u66F4\u65B0\u3055\u308C\u305F\u884C\u6570
 NB_LINE_INSERTED.NAME=\u633F\u5165\u3055\u308C\u305F\u884C\u6570
 NB_LINE_DELETED.NAME=\u524A\u9664\u3055\u308C\u305F\u884C\u6570
 USE_DIFFERENT_TABLE.NAME=\u7570\u306A\u308B\u30C6\u30FC\u30D6\u30EB\u540D\u3092\u4F7F\u7528
 DIFFERENT_TABLE_NAME.NAME=\u30C6\u30FC\u30D6\u30EB\u540D
-IS_TABLE_NAME_VARIABLE.NAME=\u63A5\u7D9A\u540D\u304B\u3089\u306E\u30C6\u30FC\u30D6\u30EB\u540D\u306F\u5909\u6570\u3067\u3042\u308B
+IS_TABLE_NAME_VARIABLE.NAME=\u63A5\u7D9A\u540D\u304B\u3089\u306E\u30C6\u30FC\u30D6\u30EB\u540D\u306F\u5909\u6570\u3067\u3059
 USE_WHERE_CONDITIONS_TABLE.NAME=WHERE\u6761\u4EF6\u30C6\u30FC\u30D6\u30EB\u3092\u4F7F\u7528
 WHERE_CONDITIONS_TABLE.NAME=
 WHERE_CONDITIONS_TABLE.ITEM.COLUMN=\u30AB\u30E9\u30E0

main/plugins/org.talend.designer.components.localprovider/components/tELTMSSqlMap/tELTMSSqlMap_java.xml

@@ -200,9 +200,9 @@
 			<IMPORT NAME="Driver-mssql-jdbc" MODULE="mssql-jdbc.jar" MVN="mvn:com.microsoft.sqlserver/mssql-jdbc/actual"  REQUIRED_IF="(DRIVER == 'MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
 			<!--Active directory dependency module: msal4j and transitive -->
 			<IMPORT NAME="msal4j" MODULE="msal4j-1.11.0.jar" MVN="mvn:com.microsoft.azure/msal4j/1.11.0"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
-			<IMPORT NAME="jackson-core" MODULE="jackson-core-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
-			<IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.13.2.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.2.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
-			<IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
+			<IMPORT NAME="jackson-core" MODULE="jackson-core-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.12.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
+			<IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.12.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
+			<IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.12.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
 			<IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-9.7.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/9.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
 			<IMPORT NAME="jcip-annotations" MODULE="jcip-annotations-1.0-1.jar" MVN="mvn:com.github.stephenc.jcip/jcip-annotations/1.0-1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
 			<IMPORT NAME="json-smart" MODULE="json-smart-2.4.7.jar" MVN="mvn:net.minidev/json-smart/2.4.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />

main/plugins/org.talend.designer.components.localprovider/components/tELTMSSqlMap/tELTMSSqlMap_messages_ja.properties

@@ -6,9 +6,9 @@ USE_EXISTING_CONNECTION.NAME=\u65E2\u5B58\u306E\u63A5\u7D9A\u3092\u4F7F\u7528
 DRY_RUN.NAME=\u30C9\u30E9\u30A4\u30E9\u30F3
 DATA_ACTION.ITEM.DELETE=\u524A\u9664
 DATA_ACTION.ITEM.INSERT=\u633F\u5165
-DATA_ACTION.ITEM.INSERT_OR_UPDATE=\u633F\u5165\u307E\u305F\u306F\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
-DATA_ACTION.ITEM.UPDATE=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
-DATA_ACTION.ITEM.UPDATE_OR_INSERT=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u307E\u305F\u306F\u633F\u5165
+DATA_ACTION.ITEM.INSERT_OR_UPDATE=\u633F\u5165\u307E\u305F\u306F\u66F4\u65B0
+DATA_ACTION.ITEM.UPDATE=\u66F4\u65B0
+DATA_ACTION.ITEM.UPDATE_OR_INSERT=\u66F4\u65B0\u307E\u305F\u306F\u633F\u5165
 DATA_ACTION.NAME=\u30C7\u30FC\u30BF\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
 DBNAME.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9
 ENCODING.NAME=\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0
@@ -23,7 +23,7 @@ SQL_SYNTAX.NAME=Sql\u69CB\u6587
 STRING_QUOTE.NAME=\u5F15\u7528\u7B26
 TABLE.NAME=\u30C6\u30FC\u30D6\u30EB
 PROPERTIES.NAME=\u8FFD\u52A0\u306EJDBC\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC
-TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u3092\u30AF\u30EA\u30A2
+TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u306E\u30AF\u30EA\u30A2
 TABLE_ACTION.ITEM.CREATE=\u30C6\u30FC\u30D6\u30EB\u306E\u4F5C\u6210
 TABLE_ACTION.ITEM.CREATE_IF_NOT_EXISTS=\u5B58\u5728\u3057\u306A\u3044\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210
 TABLE_ACTION.ITEM.DROP_CREATE=\u30C9\u30ED\u30C3\u30D7\u3057\u3066\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210

main/plugins/org.talend.designer.components.localprovider/components/tELTMSSqlOutput/tELTMSSqlOutput_messages_ja.properties

@@ -1,6 +1,6 @@
 DATA_ACTION.ITEM.DELETE=\u524A\u9664
 DATA_ACTION.ITEM.INSERT=\u633F\u5165
-DATA_ACTION.ITEM.UPDATE=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
+DATA_ACTION.ITEM.UPDATE=\u66F4\u65B0
 DATA_ACTION.ITEM.MERGE=\u30DE\u30FC\u30B8
 DATA_ACTION.NAME=\u30C7\u30FC\u30BF\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
 DBNAME.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9
@@ -37,10 +37,10 @@ WHERE_CONDITIONS_TABLE.ITEM.FUNCTION.ITEM.IN=IN
 WHERE_CONDITIONS_TABLE.ITEM.VALUE_SQL=\u5024
 ELT_TABLE_NAME.NAME=\u30C7\u30D5\u30A9\u30EB\u30C8\u30C6\u30FC\u30D6\u30EB\u540D
 ELT_SCHEMA_NAME.NAME=\u30C7\u30D5\u30A9\u30EB\u30C8\u30B9\u30AD\u30FC\u30DE
-NB_LINE_UPDATED.NAME=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3055\u308C\u305F\u884C\u6570
+NB_LINE_UPDATED.NAME=\u66F4\u65B0\u3055\u308C\u305F\u884C\u6570
 NB_LINE_INSERTED.NAME=\u633F\u5165\u3055\u308C\u305F\u884C\u6570
 NB_LINE_DELETED.NAME=\u524A\u9664\u3055\u308C\u305F\u884C\u6570
 USE_DIFFERENT_TABLE.NAME=\u7570\u306A\u308B\u30C6\u30FC\u30D6\u30EB\u540D\u3092\u4F7F\u7528
 DIFFERENT_TABLE_NAME.NAME=\u30C6\u30FC\u30D6\u30EB\u540D
-IS_TABLE_NAME_VARIABLE.NAME=\u63A5\u7D9A\u540D\u304B\u3089\u306E\u30C6\u30FC\u30D6\u30EB\u540D\u306F\u5909\u6570\u3067\u3042\u308B
-USE_UPDATE_STATEMENT.NAME=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u30B9\u30C6\u30FC\u30C8\u30E1\u30F3\u30C8\u306E\u4F7F\u7528
+IS_TABLE_NAME_VARIABLE.NAME=\u63A5\u7D9A\u540D\u304B\u3089\u306E\u30C6\u30FC\u30D6\u30EB\u540D\u306F\u5909\u6570\u3067\u3059
+USE_UPDATE_STATEMENT.NAME=\u66F4\u65B0\u30B9\u30C6\u30FC\u30C8\u30E1\u30F3\u30C8\u306E\u4F7F\u7528

main/plugins/org.talend.designer.components.localprovider/components/tELTMap/tELTMap_messages_ja.properties

@@ -6,9 +6,9 @@ USE_EXISTING_CONNECTION.NAME=\u65E2\u5B58\u306E\u63A5\u7D9A\u3092\u4F7F\u7528
 DRY_RUN.NAME=\u30C9\u30E9\u30A4\u30E9\u30F3
 DATA_ACTION.ITEM.DELETE=\u524A\u9664
 DATA_ACTION.ITEM.INSERT=\u633F\u5165
-DATA_ACTION.ITEM.INSERT_OR_UPDATE=\u633F\u5165\u307E\u305F\u306F\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
-DATA_ACTION.ITEM.UPDATE=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
-DATA_ACTION.ITEM.UPDATE_OR_INSERT=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u307E\u305F\u306F\u633F\u5165
+DATA_ACTION.ITEM.INSERT_OR_UPDATE=\u633F\u5165\u307E\u305F\u306F\u66F4\u65B0
+DATA_ACTION.ITEM.UPDATE=\u66F4\u65B0
+DATA_ACTION.ITEM.UPDATE_OR_INSERT=\u66F4\u65B0\u307E\u305F\u306F\u633F\u5165
 DATA_ACTION.NAME=\u30C7\u30FC\u30BF\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
 DBNAME.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9
 ENCODING.NAME=\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0
@@ -21,7 +21,7 @@ SQL_SYNTAX.NAME=Sql\u69CB\u6587
 STRING_QUOTE.NAME=\u5F15\u7528\u7B26
 TABLE.NAME=\u30C6\u30FC\u30D6\u30EB
 PROPERTIES.NAME=\u8FFD\u52A0\u306EJDBC\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC
-TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u3092\u30AF\u30EA\u30A2
+TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u306E\u30AF\u30EA\u30A2
 TABLE_ACTION.ITEM.CREATE=\u30C6\u30FC\u30D6\u30EB\u306E\u4F5C\u6210
 TABLE_ACTION.ITEM.CREATE_IF_NOT_EXISTS=\u5B58\u5728\u3057\u306A\u3044\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210
 TABLE_ACTION.ITEM.DROP_CREATE=\u30C9\u30ED\u30C3\u30D7\u3057\u3066\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210

main/plugins/org.talend.designer.components.localprovider/components/tELTMysqlMap/tELTMysqlMap_messages_ja.properties

@@ -5,9 +5,9 @@ PREVIEW.NAME=\u30D7\u30EC\u30D3\u30E5\u30FC
 USE_EXISTING_CONNECTION.NAME=\u65E2\u5B58\u306E\u63A5\u7D9A\u3092\u4F7F\u7528
 DATA_ACTION.ITEM.DELETE=\u524A\u9664
 DATA_ACTION.ITEM.INSERT=\u633F\u5165
-DATA_ACTION.ITEM.INSERT_OR_UPDATE=\u633F\u5165\u307E\u305F\u306F\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
-DATA_ACTION.ITEM.UPDATE=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
-DATA_ACTION.ITEM.UPDATE_OR_INSERT=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u307E\u305F\u306F\u633F\u5165
+DATA_ACTION.ITEM.INSERT_OR_UPDATE=\u633F\u5165\u307E\u305F\u306F\u66F4\u65B0
+DATA_ACTION.ITEM.UPDATE=\u66F4\u65B0
+DATA_ACTION.ITEM.UPDATE_OR_INSERT=\u66F4\u65B0\u307E\u305F\u306F\u633F\u5165
 DATA_ACTION.NAME=\u30C7\u30FC\u30BF\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
 DBD-ODBC.INFO=ODBC\u306E\u3088\u3046\u306A\u63A5\u7D9A\u3067\u5FC5\u9808
 DBD-Oracle.INFO=Oracle\u3067\u5FC5\u9808
@@ -25,7 +25,7 @@ SCHEMA.NAME=\u30B9\u30AD\u30FC\u30DE
 SQL_SYNTAX.NAME=Sql\u69CB\u6587
 STRING_QUOTE.NAME=\u5F15\u7528\u7B26
 TABLE.NAME=\u30C6\u30FC\u30D6\u30EB
-TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u3092\u30AF\u30EA\u30A2
+TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u306E\u30AF\u30EA\u30A2
 TABLE_ACTION.ITEM.CREATE=\u30C6\u30FC\u30D6\u30EB\u306E\u4F5C\u6210
 TABLE_ACTION.ITEM.CREATE_IF_NOT_EXISTS=\u5B58\u5728\u3057\u306A\u3044\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210
 TABLE_ACTION.ITEM.DROP_CREATE=\u30C9\u30ED\u30C3\u30D7\u3057\u3066\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210

main/plugins/org.talend.designer.components.localprovider/components/tELTMysqlOutput/tELTMysqlOutput_messages_ja.properties

@@ -8,7 +8,7 @@ ADD_COLS.ITEM.SQL=SQL\u5F0F
 ADD_COLS.NAME=\u8FFD\u52A0\u30AB\u30E9\u30E0
 DATA_ACTION.ITEM.DELETE=\u524A\u9664
 DATA_ACTION.ITEM.INSERT=\u633F\u5165
-DATA_ACTION.ITEM.UPDATE=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
+DATA_ACTION.ITEM.UPDATE=\u66F4\u65B0
 DATA_ACTION.NAME=\u30C7\u30FC\u30BF\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
 DBD-ODBC.INFO=ODBC\u306E\u3088\u3046\u306A\u63A5\u7D9A\u3067\u5FC5\u9808
 DBD-Oracle.INFO=Oracle\u3067\u5FC5\u9808
@@ -53,7 +53,7 @@ WHERE_CONDITIONS_TABLE.ITEM.FUNCTION.ITEM.IN=IN
 WHERE_CONDITIONS_TABLE.ITEM.VALUE_SQL=\u5024
 USE_DIFFERENT_TABLE.NAME=\u7570\u306A\u308B\u30C6\u30FC\u30D6\u30EB\u540D\u3092\u4F7F\u7528
 DIFFERENT_TABLE_NAME.NAME=\u30C6\u30FC\u30D6\u30EB\u540D
-IS_TABLE_NAME_VARIABLE.NAME=\u63A5\u7D9A\u540D\u304B\u3089\u306E\u30C6\u30FC\u30D6\u30EB\u540D\u306F\u5909\u6570\u3067\u3042\u308B
-NB_LINE_UPDATED.NAME=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3055\u308C\u305F\u884C\u6570
+IS_TABLE_NAME_VARIABLE.NAME=\u63A5\u7D9A\u540D\u304B\u3089\u306E\u30C6\u30FC\u30D6\u30EB\u540D\u306F\u5909\u6570\u3067\u3059
+NB_LINE_UPDATED.NAME=\u66F4\u65B0\u3055\u308C\u305F\u884C\u6570
 NB_LINE_INSERTED.NAME=\u633F\u5165\u3055\u308C\u305F\u884C\u6570
 NB_LINE_DELETED.NAME=\u524A\u9664\u3055\u308C\u305F\u884C\u6570

main/plugins/org.talend.designer.components.localprovider/components/tELTNetezzaOutput/tELTNetezzaOutput_messages_ja.properties

@@ -3,15 +3,15 @@ LONG_NAME=tELTNetezzaMap\u3067\u69CB\u7BC9\u3055\u308C\u305F\u9078\u629E\u30AF\u
 DATA_ACTION.NAME=\u30C7\u30FC\u30BF\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
 DATA_ACTION.ITEM.DELETE=\u524A\u9664
 DATA_ACTION.ITEM.INSERT=\u633F\u5165
-DATA_ACTION.ITEM.UPDATE=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
+DATA_ACTION.ITEM.UPDATE=\u66F4\u65B0
 SCHEMA.NAME=\u30B9\u30AD\u30FC\u30DE
 WHERE_CLAUSE.NAME=WHERE\u53E5 \n(UPDATE\u3068DELETE\u306E\u5834\u5408\u306E\u307F)
 ELT_TABLE_NAME.NAME=\u30C7\u30D5\u30A9\u30EB\u30C8\u30C6\u30FC\u30D6\u30EB\u540D
 USE_DIFFERENT_TABLE.NAME=\u7570\u306A\u308B\u30C6\u30FC\u30D6\u30EB\u540D\u3092\u4F7F\u7528
 DIFFERENT_TABLE_NAME.NAME=\u30C6\u30FC\u30D6\u30EB\u540D
-IS_TABLE_NAME_VARIABLE.NAME=\u63A5\u7D9A\u540D\u304B\u3089\u306E\u30C6\u30FC\u30D6\u30EB\u540D\u306F\u5909\u6570\u3067\u3042\u308B
+IS_TABLE_NAME_VARIABLE.NAME=\u63A5\u7D9A\u540D\u304B\u3089\u306E\u30C6\u30FC\u30D6\u30EB\u540D\u306F\u5909\u6570\u3067\u3059
 NB_LINE.NAME=\u884C\u6570
-NB_LINE_UPDATED.NAME=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3055\u308C\u305F\u884C\u6570
+NB_LINE_UPDATED.NAME=\u66F4\u65B0\u3055\u308C\u305F\u884C\u6570
 NB_LINE_INSERTED.NAME=\u633F\u5165\u3055\u308C\u305F\u884C\u6570
 NB_LINE_DELETED.NAME=\u524A\u9664\u3055\u308C\u305F\u884C\u6570
 USE_WHERE_CONDITIONS_TABLE.NAME=WHERE\u6761\u4EF6\u30C6\u30FC\u30D6\u30EB\u3092\u4F7F\u7528

main/plugins/org.talend.designer.components.localprovider/components/tELTOracleMap/tELTOracleMap_messages_ja.properties

@@ -12,9 +12,9 @@ CONNECTION_TYPE.NAME=\u63A5\u7D9A\u30BF\u30A4\u30D7
 RAC_URL.NAME=URL
 DATA_ACTION.ITEM.DELETE=\u524A\u9664
 DATA_ACTION.ITEM.INSERT=\u633F\u5165
-DATA_ACTION.ITEM.INSERT_OR_UPDATE=\u633F\u5165\u307E\u305F\u306F\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
-DATA_ACTION.ITEM.UPDATE=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
-DATA_ACTION.ITEM.UPDATE_OR_INSERT=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u307E\u305F\u306F\u633F\u5165
+DATA_ACTION.ITEM.INSERT_OR_UPDATE=\u633F\u5165\u307E\u305F\u306F\u66F4\u65B0
+DATA_ACTION.ITEM.UPDATE=\u66F4\u65B0
+DATA_ACTION.ITEM.UPDATE_OR_INSERT=\u66F4\u65B0\u307E\u305F\u306F\u633F\u5165
 DATA_ACTION.NAME=\u30C7\u30FC\u30BF\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
 DBD-ODBC.INFO=ODBC\u306E\u3088\u3046\u306A\u63A5\u7D9A\u3067\u5FC5\u9808
 DBD-Oracle.INFO=Oracle\u3067\u5FC5\u9808
@@ -32,7 +32,7 @@ SCHEMA.NAME=\u30B9\u30AD\u30FC\u30DE
 SQL_SYNTAX.NAME=Sql\u69CB\u6587
 STRING_QUOTE.NAME=\u5F15\u7528\u7B26
 TABLE.NAME=\u30C6\u30FC\u30D6\u30EB
-TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u3092\u30AF\u30EA\u30A2
+TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u306E\u30AF\u30EA\u30A2
 TABLE_ACTION.ITEM.CREATE=\u30C6\u30FC\u30D6\u30EB\u306E\u4F5C\u6210
 TABLE_ACTION.ITEM.CREATE_IF_NOT_EXISTS=\u5B58\u5728\u3057\u306A\u3044\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210
 TABLE_ACTION.ITEM.DROP_CREATE=\u30C9\u30ED\u30C3\u30D7\u3057\u3066\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210

main/plugins/org.talend.designer.components.localprovider/components/tELTOracleOutput/tELTOracleOutput_main.javajet

@@ -637,37 +637,46 @@ if(dbtable != null && columnList != null){
 	if(("INSERT").equals(dataAction)){
 	%>
 
-System.out.println("Inserting with : \n" + insertQuery_<%=cid %> + "\n");
+<%if(!isLog4jEnabled){%>System.out.println("Inserting with : \n" + insertQuery_<%=cid %> + "\n");<%}%>
 <%log4jCodeGenerateUtil.logInfo(node,"info",cid+" - Executing SQL:\"+insertQuery_"+ cid +"+\"");%>
 nb_line_inserted_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
 <%log4jCodeGenerateUtil.logInfo(node,"info",cid+" - Executed successfully.");%>
-System.out.println("--> " + nb_line_inserted_<%=cid%> + " rows inserted. \n");
+<%if(!isLog4jEnabled){%>System.out.println("--> " + nb_line_inserted_<%=cid%> + " rows inserted. \n");<%}%>
 
 	<%
 	}else if(("UPDATE").equals(dataAction)){
 
 	%>
-System.out.println("Updating with : \n" + updateQuery_<%=cid %>.toString() +"\n");
+<%if(!isLog4jEnabled){%>System.out.println("Updating with : \n" + updateQuery_<%=cid %>.toString() +"\n");<%}%>
 <%log4jCodeGenerateUtil.logInfo(node,"info",cid+" - Executing SQL:\"+updateQuery_"+ cid +"+\"");%>
 nb_line_updated_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
 <%log4jCodeGenerateUtil.logInfo(node,"info",cid+" - Executed successfully.");%>
-System.out.println("--> " + nb_line_updated_<%=cid%> + " rows updated. \n");
+	<%if(!isLog4jEnabled){%>System.out.println("--> " + nb_line_updated_<%=cid%> + " rows updated. \n");<%}%>
 	<%
 	}else if (("DELETE").equals(dataAction)){
 		%>
-		System.out.println("Deleting with : \n" + deleteQuery_<%=cid %>.toString() +"\n");
+	<%if(!isLog4jEnabled){%>System.out.println("Deleting with : \n" + deleteQuery_<%=cid %>.toString() +"\n");<%}%>
 		<%log4jCodeGenerateUtil.logInfo(node,"info",cid+" - Executing SQL:\"+deleteQuery_"+ cid +"+\"");%>
 		nb_line_deleted_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
 		<%log4jCodeGenerateUtil.logInfo(node,"info",cid+" - Executed successfully.");%>
-		System.out.println("--> " + nb_line_deleted_<%=cid%> + " rows deleted. \n");
+	<%if(!isLog4jEnabled){%>System.out.println("--> " + nb_line_deleted_<%=cid%> + " rows deleted. \n");<%}%>
 		<%
 	}else if (("MERGE").equals(dataAction)){
 	%>
+<%
+    if(!isLog4jEnabled){
+%>
         System.out.println("Merge with : \n" + mergeQuery_<%=cid %> +"\n");
-        <%log4jCodeGenerateUtil.logInfo(node,"info",cid+" - Executing SQL:\"+mergeQuery_"+ cid +"+\"");%>
+<%
+    } else {
+%>
+        log.info("<%=cid %> - Executing SQL: " + mergeQuery_<%=cid %>);
+<%
+    }
+%>
 	    nb_line_merged_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
 		<%log4jCodeGenerateUtil.logInfo(node,"info",cid+" - Executed successfully.");%>
-		System.out.println("--> " + nb_line_merged_<%=cid%> + " rows merged. \n");
+	<%if(!isLog4jEnabled){%>System.out.println("--> " + nb_line_merged_<%=cid%> + " rows merged. \n");<%}%>
 	<%
 	}
   }

main/plugins/org.talend.designer.components.localprovider/components/tELTOracleOutput/tELTOracleOutput_messages_ja.properties

@@ -8,7 +8,7 @@ ADD_COLS.ITEM.SQL=SQL\u5F0F
 ADD_COLS.NAME=\u8FFD\u52A0\u30AB\u30E9\u30E0
 DATA_ACTION.ITEM.DELETE=\u524A\u9664
 DATA_ACTION.ITEM.INSERT=\u633F\u5165
-DATA_ACTION.ITEM.UPDATE=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
+DATA_ACTION.ITEM.UPDATE=\u66F4\u65B0
 DATA_ACTION.ITEM.MERGE=\u30DE\u30FC\u30B8
 DATA_ACTION.NAME=\u30C7\u30FC\u30BF\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
 DBD-ODBC.INFO=ODBC\u306E\u3088\u3046\u306A\u63A5\u7D9A\u3067\u5FC5\u9808
@@ -49,22 +49,22 @@ WHERE_CONDITIONS_TABLE.ITEM.FUNCTION.ITEM.IN=IN
 WHERE_CONDITIONS_TABLE.ITEM.VALUE_SQL=\u5024
 ELT_TABLE_NAME.NAME=\u30C7\u30D5\u30A9\u30EB\u30C8\u30C6\u30FC\u30D6\u30EB\u540D
 ELT_SCHEMA_NAME.NAME=\u30C7\u30D5\u30A9\u30EB\u30C8\u30B9\u30AD\u30FC\u30DE
-NB_LINE_UPDATED.NAME=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3055\u308C\u305F\u884C\u6570
+NB_LINE_UPDATED.NAME=\u66F4\u65B0\u3055\u308C\u305F\u884C\u6570
 NB_LINE_INSERTED.NAME=\u633F\u5165\u3055\u308C\u305F\u884C\u6570
 NB_LINE_DELETED.NAME=\u524A\u9664\u3055\u308C\u305F\u884C\u6570
 NB_LINE_MERGED.NAME=\u30DE\u30FC\u30B8\u884C\u6570
-USE_MERGE_UPDATE.NAME=\u30DE\u30FC\u30B8\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3092\u4F7F\u7528
+USE_MERGE_UPDATE.NAME=\u30DE\u30FC\u30B8\u66F4\u65B0\u3092\u4F7F\u7528
 USE_MERGE_INSERT.NAME=\u30DE\u30FC\u30B8\u633F\u5165\u3092\u4F7F\u7528
 SCHEMA_UPDATE.NAME=
 SCHEMA_INSERT.NAME=
 SCHEMA_INSERT.ITEM.INSERT=\u3059\u3079\u3066\u30C1\u30A7\u30C3\u30AF
-USE_MERGE_UPDATE_WHERE.NAME=\u30DE\u30FC\u30B8\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u306BWHERE\u53E5\u3092\u4F7F\u7528
+USE_MERGE_UPDATE_WHERE.NAME=\u30DE\u30FC\u30B8\u66F4\u65B0\u306BWHERE\u53E5\u3092\u4F7F\u7528
 MERGE_UPDATE_WHERE_STRING.NAME=
-USE_MERGE_UPDATE_DELETE_WHERE.NAME=\u30DE\u30FC\u30B8\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u306BDELETE\u53E5\u3092\u4F7F\u7528
+USE_MERGE_UPDATE_DELETE_WHERE.NAME=\u30DE\u30FC\u30B8\u66F4\u65B0\u306BDELETE\u53E5\u3092\u4F7F\u7528
 MERGE_UPDATE_DELETE_WHERE_STRING.NAME=
 USE_MERGE_INSERT_WHERE.NAME=\u30DE\u30FC\u30B8\u633F\u5165\u306BWHERE\u53E5\u3092\u4F7F\u7528
 MERGE_INSERT_WHERE_STRING.NAME=
-SCHEMA_UPDATE.ITEM.UPDATE=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
+SCHEMA_UPDATE.ITEM.UPDATE=\u66F4\u65B0
 SCHEMA_UPDATE.ITEM.INSERT=\u633F\u5165
 USE_HINT_OPTIONS.NAME=HINT\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u4F7F\u7528
 HINT_OPTIONS.NAME=HINT\u30AA\u30D7\u30B7\u30E7\u30F3
@@ -78,4 +78,4 @@ HINT_OPTIONS.ITEM.SQL_STMT.ITEM.DELETE=DELETE
 HINT_OPTIONS.ITEM.SQL_STMT.ITEM.MERGE=\u30DE\u30FC\u30B8
 USE_DIFFERENT_TABLE.NAME=\u7570\u306A\u308B\u30C6\u30FC\u30D6\u30EB\u540D\u3092\u4F7F\u7528
 DIFFERENT_TABLE_NAME.NAME=\u30C6\u30FC\u30D6\u30EB\u540D
-IS_TABLE_NAME_VARIABLE.NAME=\u63A5\u7D9A\u540D\u304B\u3089\u306E\u30C6\u30FC\u30D6\u30EB\u540D\u306F\u5909\u6570\u3067\u3042\u308B
+IS_TABLE_NAME_VARIABLE.NAME=\u63A5\u7D9A\u540D\u304B\u3089\u306E\u30C6\u30FC\u30D6\u30EB\u540D\u306F\u5909\u6570\u3067\u3059

main/plugins/org.talend.designer.components.localprovider/components/tELTOutput/tELTOutput_main.javajet

@@ -13,7 +13,7 @@ imports="
         java.util.List
         java.util.ArrayList
         java.util.LinkedList
-        java.util.StringJoiner
+    java.util.StringJoiner
         java.util.Map
         java.util.HashMap
 "
@@ -80,7 +80,6 @@ skeleton="../templates/db_output_bulk.skeleton"
     String dbuser = null;
     boolean useExistingConn = false;
     boolean dryRun = false;
-    boolean autoWrapColumnName = false;
     if(previousNode != null) {
         dryRun = ("true").equals(ElementParameterParser.getValue(previousNode, "__DRY_RUN__"));
         if(!dryRun){
@@ -89,7 +88,6 @@ skeleton="../templates/db_output_bulk.skeleton"
             dbuser = ElementParameterParser.getValue(previousNode, "__USER__");
             useExistingConn = ("true").equals(ElementParameterParser.getValue(previousNode, "__USE_EXISTING_CONNECTION__"));
         }
-        autoWrapColumnName = "true".equals(ElementParameterParser.getValue(previousNode, "__ACTIVE_DATABASE_DELIMITED_IDENTIFIERS__"));
     }
 
     boolean useWhereTable = ("true").equals(ElementParameterParser.getValue(node, "__USE_WHERE_CONDITIONS_TABLE__"));
@@ -142,7 +140,7 @@ skeleton="../templates/db_output_bulk.skeleton"
             columnList = metadata.getListColumns();
         }
     }
-    
+
     if(columnList != null && columnList.size()>0){
         StringBuilder insertColName = new StringBuilder();
 
@@ -150,7 +148,6 @@ skeleton="../templates/db_output_bulk.skeleton"
         boolean isUpdate = "UPDATE".equals(dataAction);
         List<Map<String, String>> setColumns = (List<Map<String,String>>)ElementParameterParser.getObjectValue(node, "__SET_COLUMN__");
         int counterOuter = 0;
-
         for(IMetadataColumn column : columnList){
             String suffix = ",";
 
@@ -162,16 +159,12 @@ skeleton="../templates/db_output_bulk.skeleton"
             if(columnName==null || columnName.trim().isEmpty()){
                 columnName = column.getLabel();
             }
-
-            //use empty string as need to keep old action if not autoWrapColumnName
-            if(MYSQL.equalsIgnoreCase(dbmsId) || SINGLESTORE.equalsIgnoreCase(dbmsId) || "amazon_aurora_id".equalsIgnoreCase(dbmsId)) {
-                columnName = ColumnHelper.wrapColumnNameByGraveAccentIfNecessary(autoWrapColumnName, "", columnName, "");
-            } else if(ACCESS.equalsIgnoreCase(dbmsId) || MSSQL.equalsIgnoreCase(dbmsId)) {
-                columnName = ColumnHelper.wrapColumnNameByBracketIfNecessary(autoWrapColumnName, "", columnName, "");
-            } else {
-                columnName = ColumnHelper.wrapColumnNameByDoubleQuoteIfNecessary(autoWrapColumnName, "", columnName, "");
+            if (columnName.startsWith("\"")) {
+                columnName = "\\" + columnName;
+            }
+            if (columnName.endsWith("\"") && !columnName.endsWith("\\\"")) {
+                columnName = columnName.substring(0, columnName.lastIndexOf("\"")) + "\\" + "\"";
             }
-            
           boolean isUpdateColumn = "true".equals(setColumns.get(counterOuter).get("UPDATE_COLUMN"));
           insertColName.append(columnName).append(suffix);
           if (isUpdate && isUpdateColumn) {
@@ -296,8 +289,8 @@ skeleton="../templates/db_output_bulk.skeleton"
             Manager manager = null;
 
             String tableAction = ElementParameterParser.getValue(node,"__TABLE_ACTION__");
-            
-            List<Column> stmtStructure = getELTManager(dbmsId, cid, node, autoWrapColumnName).createColumnList(columnList, false, null, null);
+
+            List<Column> stmtStructure = getELTManager(dbmsId, cid, node).createColumnList(columnList, false, null, null);
 
             String table = tableName;
             dbLog = new DBLogUtil(node);

main/plugins/org.talend.designer.components.localprovider/components/tELTOutput/tELTOutput_messages_ja.properties

@@ -1,6 +1,6 @@
 DATA_ACTION.ITEM.DELETE=\u524A\u9664
 DATA_ACTION.ITEM.INSERT=\u633F\u5165
-DATA_ACTION.ITEM.UPDATE=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
+DATA_ACTION.ITEM.UPDATE=\u66F4\u65B0
 DATA_ACTION.ITEM.MERGE=\u30DE\u30FC\u30B8
 DATA_ACTION.NAME=\u30C7\u30FC\u30BF\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
 DBNAME.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9
@@ -37,21 +37,21 @@ WHERE_CONDITIONS_TABLE.ITEM.FUNCTION.ITEM.IN=IN
 WHERE_CONDITIONS_TABLE.ITEM.VALUE_SQL=\u5024
 ELT_TABLE_NAME.NAME=\u30C7\u30D5\u30A9\u30EB\u30C8\u30C6\u30FC\u30D6\u30EB\u540D
 ELT_SCHEMA_NAME.NAME=\u30C7\u30D5\u30A9\u30EB\u30C8\u30B9\u30AD\u30FC\u30DE
-NB_LINE_UPDATED.NAME=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3055\u308C\u305F\u884C\u6570
+NB_LINE_UPDATED.NAME=\u66F4\u65B0\u3055\u308C\u305F\u884C\u6570
 NB_LINE_INSERTED.NAME=\u633F\u5165\u3055\u308C\u305F\u884C\u6570
 NB_LINE_DELETED.NAME=\u524A\u9664\u3055\u308C\u305F\u884C\u6570
 USE_DIFFERENT_TABLE.NAME=\u7570\u306A\u308B\u30C6\u30FC\u30D6\u30EB\u540D\u3092\u4F7F\u7528
 DIFFERENT_TABLE_NAME.NAME=\u30C6\u30FC\u30D6\u30EB\u540D
-IS_TABLE_NAME_VARIABLE.NAME=\u63A5\u7D9A\u540D\u304B\u3089\u306E\u30C6\u30FC\u30D6\u30EB\u540D\u306F\u5909\u6570\u3067\u3042\u308B
-TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u3092\u30AF\u30EA\u30A2
-TABLE_ACTION.ITEM.TRUNCATE=\u30C6\u30FC\u30D6\u30EB\u3092\u5207\u308A\u6368\u3066
+IS_TABLE_NAME_VARIABLE.NAME=\u63A5\u7D9A\u540D\u304B\u3089\u306E\u30C6\u30FC\u30D6\u30EB\u540D\u306F\u5909\u6570\u3067\u3059
+TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u306E\u30AF\u30EA\u30A2
+TABLE_ACTION.ITEM.TRUNCATE=\u30C6\u30FC\u30D6\u30EB\u306E\u5207\u308A\u6368\u3066
 TABLE_ACTION.ITEM.CREATE=\u30C6\u30FC\u30D6\u30EB\u306E\u4F5C\u6210
 TABLE_ACTION.ITEM.CREATE_IF_NOT_EXISTS=\u5B58\u5728\u3057\u306A\u3044\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210
 TABLE_ACTION.ITEM.DROP_IF_EXISTS_AND_CREATE=\u5B58\u5728\u3059\u308B\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u524A\u9664\u3057\u3066\u4F5C\u6210
 TABLE_ACTION.ITEM.DROP_CREATE=\u30C9\u30ED\u30C3\u30D7\u3057\u3066\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210
 TABLE_ACTION.ITEM.NONE=\u306A\u3057
 TABLE_ACTION.NAME=\u30C6\u30FC\u30D6\u30EB\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
-USE_UPDATE_STATEMENT.NAME=\u30B5\u30D6\u30AF\u30A8\u30EA\u30FC\u306A\u3057\u3067\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u30B9\u30C6\u30FC\u30C8\u30E1\u30F3\u30C8\u3092\u4F7F\u7528
-SET_COLUMN.ITEM.UPDATE_COLUMN=\u30AB\u30E9\u30E0\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
+USE_UPDATE_STATEMENT.NAME=\u30B5\u30D6\u30AF\u30A8\u30EA\u30FC\u306A\u3057\u3067\u66F4\u65B0\u30B9\u30C6\u30FC\u30C8\u30E1\u30F3\u30C8\u3092\u4F7F\u7528
+SET_COLUMN.ITEM.UPDATE_COLUMN=\u30AB\u30E9\u30E0\u3092\u66F4\u65B0
 SET_COLUMN.NAME=SET\u53E5
 PARTITION.NAME=\u30D1\u30FC\u30C6\u30A3\u30B7\u30E7\u30F3

main/plugins/org.talend.designer.components.localprovider/components/tELTPostgresqlMap/tELTPostgresqlMap_messages_ja.properties

@@ -5,9 +5,9 @@ PREVIEW.NAME=\u30D7\u30EC\u30D3\u30E5\u30FC
 USE_EXISTING_CONNECTION.NAME=\u65E2\u5B58\u306E\u63A5\u7D9A\u3092\u4F7F\u7528
 DATA_ACTION.ITEM.DELETE=\u524A\u9664
 DATA_ACTION.ITEM.INSERT=\u633F\u5165
-DATA_ACTION.ITEM.INSERT_OR_UPDATE=\u633F\u5165\u307E\u305F\u306F\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
-DATA_ACTION.ITEM.UPDATE=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
-DATA_ACTION.ITEM.UPDATE_OR_INSERT=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u307E\u305F\u306F\u633F\u5165
+DATA_ACTION.ITEM.INSERT_OR_UPDATE=\u633F\u5165\u307E\u305F\u306F\u66F4\u65B0
+DATA_ACTION.ITEM.UPDATE=\u66F4\u65B0
+DATA_ACTION.ITEM.UPDATE_OR_INSERT=\u66F4\u65B0\u307E\u305F\u306F\u633F\u5165
 DATA_ACTION.NAME=\u30C7\u30FC\u30BF\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
 DBNAME.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9
 ENCODING.NAME=\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0
@@ -22,7 +22,7 @@ SQL_SYNTAX.NAME=Sql\u69CB\u6587
 STRING_QUOTE.NAME=\u5F15\u7528\u7B26
 TABLE.NAME=\u30C6\u30FC\u30D6\u30EB
 PROPERTIES.NAME=\u8FFD\u52A0\u306EJDBC\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC
-TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u3092\u30AF\u30EA\u30A2
+TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u306E\u30AF\u30EA\u30A2
 TABLE_ACTION.ITEM.CREATE=\u30C6\u30FC\u30D6\u30EB\u306E\u4F5C\u6210
 TABLE_ACTION.ITEM.CREATE_IF_NOT_EXISTS=\u5B58\u5728\u3057\u306A\u3044\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210
 TABLE_ACTION.ITEM.DROP_CREATE=\u30C9\u30ED\u30C3\u30D7\u3057\u3066\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210

main/plugins/org.talend.designer.components.localprovider/components/tELTPostgresqlOutput/tELTPostgresqlOutput_messages_ja.properties

@@ -1,6 +1,6 @@
 DATA_ACTION.ITEM.DELETE=\u524A\u9664
 DATA_ACTION.ITEM.INSERT=\u633F\u5165
-DATA_ACTION.ITEM.UPDATE=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
+DATA_ACTION.ITEM.UPDATE=\u66F4\u65B0
 DATA_ACTION.ITEM.MERGE=\u30DE\u30FC\u30B8
 DATA_ACTION.NAME=\u30C7\u30FC\u30BF\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
 DBNAME.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9
@@ -36,10 +36,10 @@ WHERE_CONDITIONS_TABLE.ITEM.FUNCTION.ITEM.IN=IN
 WHERE_CONDITIONS_TABLE.ITEM.VALUE_SQL=\u5024
 ELT_TABLE_NAME.NAME=\u30C7\u30D5\u30A9\u30EB\u30C8\u30C6\u30FC\u30D6\u30EB\u540D
 ELT_SCHEMA_NAME.NAME=\u30C7\u30D5\u30A9\u30EB\u30C8\u30B9\u30AD\u30FC\u30DE
-NB_LINE_UPDATED.NAME=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3055\u308C\u305F\u884C\u6570
+NB_LINE_UPDATED.NAME=\u66F4\u65B0\u3055\u308C\u305F\u884C\u6570
 NB_LINE_INSERTED.NAME=\u633F\u5165\u3055\u308C\u305F\u884C\u6570
 NB_LINE_DELETED.NAME=\u524A\u9664\u3055\u308C\u305F\u884C\u6570
 USE_DIFFERENT_TABLE.NAME=\u7570\u306A\u308B\u30C6\u30FC\u30D6\u30EB\u540D\u3092\u4F7F\u7528
 DIFFERENT_TABLE_NAME.NAME=\u30C6\u30FC\u30D6\u30EB\u540D
-IS_TABLE_NAME_VARIABLE.NAME=\u63A5\u7D9A\u540D\u304B\u3089\u306E\u30C6\u30FC\u30D6\u30EB\u540D\u306F\u5909\u6570\u3067\u3042\u308B
-USE_UPDATE_STATEMENT.NAME=\u30B5\u30D6\u30AF\u30A8\u30EA\u30FC\u306A\u3057\u3067\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u30B9\u30C6\u30FC\u30C8\u30E1\u30F3\u30C8\u3092\u4F7F\u7528
+IS_TABLE_NAME_VARIABLE.NAME=\u63A5\u7D9A\u540D\u304B\u3089\u306E\u30C6\u30FC\u30D6\u30EB\u540D\u306F\u5909\u6570\u3067\u3059
+USE_UPDATE_STATEMENT.NAME=\u30B5\u30D6\u30AF\u30A8\u30EA\u30FC\u306A\u3057\u3067\u66F4\u65B0\u30B9\u30C6\u30FC\u30C8\u30E1\u30F3\u30C8\u3092\u4F7F\u7528

main/plugins/org.talend.designer.components.localprovider/components/tELTSybaseOutput/tELTSybaseOutput_messages_ja.properties

@@ -8,7 +8,7 @@ ADD_COLS.ITEM.SQL=SQL\u5F0F
 ADD_COLS.NAME=\u8FFD\u52A0\u30AB\u30E9\u30E0
 DATA_ACTION.ITEM.DELETE=\u524A\u9664
 DATA_ACTION.ITEM.INSERT=\u633F\u5165
-DATA_ACTION.ITEM.UPDATE=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
+DATA_ACTION.ITEM.UPDATE=\u66F4\u65B0
 DATA_ACTION.NAME=\u30C7\u30FC\u30BF\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
 DBD-ODBC.INFO=ODBC\u306E\u3088\u3046\u306A\u63A5\u7D9A\u3067\u5FC5\u9808
 DBD-Oracle.INFO=Oracle\u3067\u5FC5\u9808
@@ -52,9 +52,9 @@ WHERE_CONDITIONS_TABLE.ITEM.FUNCTION.ITEM.BETWEEN=BETWEEN
 WHERE_CONDITIONS_TABLE.ITEM.FUNCTION.ITEM.LIKE=LIKE
 WHERE_CONDITIONS_TABLE.ITEM.FUNCTION.ITEM.IN=IN
 WHERE_CONDITIONS_TABLE.ITEM.VALUE_SQL=\u5024
-NB_LINE_UPDATED.NAME=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3055\u308C\u305F\u884C\u6570
+NB_LINE_UPDATED.NAME=\u66F4\u65B0\u3055\u308C\u305F\u884C\u6570
 NB_LINE_INSERTED.NAME=\u633F\u5165\u3055\u308C\u305F\u884C\u6570
 NB_LINE_DELETED.NAME=\u524A\u9664\u3055\u308C\u305F\u884C\u6570
 USE_DIFFERENT_TABLE.NAME=\u7570\u306A\u308B\u30C6\u30FC\u30D6\u30EB\u540D\u3092\u4F7F\u7528
 DIFFERENT_TABLE_NAME.NAME=\u30C6\u30FC\u30D6\u30EB\u540D
-IS_TABLE_NAME_VARIABLE.NAME=\u63A5\u7D9A\u540D\u304B\u3089\u306E\u30C6\u30FC\u30D6\u30EB\u540D\u306F\u5909\u6570\u3067\u3042\u308B
+IS_TABLE_NAME_VARIABLE.NAME=\u63A5\u7D9A\u540D\u304B\u3089\u306E\u30C6\u30FC\u30D6\u30EB\u540D\u306F\u5909\u6570\u3067\u3059

main/plugins/org.talend.designer.components.localprovider/components/tELTTeradataMap/tELTTeradataMap_java.xml

@@ -128,7 +128,8 @@
 
 	<CODEGENERATION>
 	<IMPORTS>
-		<IMPORT NAME="Driver-Teradata" MODULE="terajdbc4-17.10.00.27.jar" MVN="mvn:com.teradata.jdbc/terajdbc4/17.10.00.27" REQUIRED="true" />
+		<IMPORT NAME="Driver-Teradata" MODULE="terajdbc4-16.20.00.02.jar" MVN="mvn:com.teradata/terajdbc4/16.20.00.02" REQUIRED="true" />
+		<IMPORT NAME="Driver-Teradata" MODULE="tdgssconfig-16.20.00.02.jar" MVN="mvn:com.teradata/tdgssconfig/16.20.00.02" REQUIRED="true" />
 	</IMPORTS>
 	</CODEGENERATION>
 

main/plugins/org.talend.designer.components.localprovider/components/tELTTeradataMap/tELTTeradataMap_messages_ja.properties

@@ -5,9 +5,9 @@ PREVIEW.NAME=\u30D7\u30EC\u30D3\u30E5\u30FC
 USE_EXISTING_CONNECTION.NAME=\u65E2\u5B58\u306E\u63A5\u7D9A\u3092\u4F7F\u7528
 DATA_ACTION.ITEM.DELETE=\u524A\u9664
 DATA_ACTION.ITEM.INSERT=\u633F\u5165
-DATA_ACTION.ITEM.INSERT_OR_UPDATE=\u633F\u5165\u307E\u305F\u306F\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
-DATA_ACTION.ITEM.UPDATE=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
-DATA_ACTION.ITEM.UPDATE_OR_INSERT=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u307E\u305F\u306F\u633F\u5165
+DATA_ACTION.ITEM.INSERT_OR_UPDATE=\u633F\u5165\u307E\u305F\u306F\u66F4\u65B0
+DATA_ACTION.ITEM.UPDATE=\u66F4\u65B0
+DATA_ACTION.ITEM.UPDATE_OR_INSERT=\u66F4\u65B0\u307E\u305F\u306F\u633F\u5165
 DATA_ACTION.NAME=\u30C7\u30FC\u30BF\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
 DBD-ODBC.INFO=ODBC\u306E\u3088\u3046\u306A\u63A5\u7D9A\u3067\u5FC5\u9808
 DBD-Oracle.INFO=Oracle\u3067\u5FC5\u9808
@@ -25,7 +25,7 @@ SCHEMA.NAME=\u30B9\u30AD\u30FC\u30DE
 SQL_SYNTAX.NAME=Sql\u69CB\u6587
 STRING_QUOTE.NAME=\u5F15\u7528\u7B26
 TABLE.NAME=\u30C6\u30FC\u30D6\u30EB
-TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u3092\u30AF\u30EA\u30A2
+TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u306E\u30AF\u30EA\u30A2
 TABLE_ACTION.ITEM.CREATE=\u30C6\u30FC\u30D6\u30EB\u306E\u4F5C\u6210
 TABLE_ACTION.ITEM.CREATE_IF_NOT_EXISTS=\u5B58\u5728\u3057\u306A\u3044\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210
 TABLE_ACTION.ITEM.DROP_CREATE=\u30C9\u30ED\u30C3\u30D7\u3057\u3066\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210

main/plugins/org.talend.designer.components.localprovider/components/tELTTeradataOutput/tELTTeradataOutput_messages_ja.properties

@@ -8,7 +8,7 @@ ADD_COLS.ITEM.SQL=SQL\u5F0F
 ADD_COLS.NAME=\u8FFD\u52A0\u30AB\u30E9\u30E0
 DATA_ACTION.ITEM.DELETE=\u524A\u9664
 DATA_ACTION.ITEM.INSERT=\u633F\u5165
-DATA_ACTION.ITEM.UPDATE=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
+DATA_ACTION.ITEM.UPDATE=\u66F4\u65B0
 DATA_ACTION.NAME=\u30C7\u30FC\u30BF\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
 DBD-ODBC.INFO=ODBC\u306E\u3088\u3046\u306A\u63A5\u7D9A\u3067\u5FC5\u9808
 DBD-Oracle.INFO=Oracle\u3067\u5FC5\u9808
@@ -52,11 +52,11 @@ WHERE_CONDITIONS_TABLE.ITEM.FUNCTION.ITEM.BETWEEN=BETWEEN
 WHERE_CONDITIONS_TABLE.ITEM.FUNCTION.ITEM.LIKE=LIKE
 WHERE_CONDITIONS_TABLE.ITEM.FUNCTION.ITEM.IN=IN
 WHERE_CONDITIONS_TABLE.ITEM.VALUE_SQL=\u5024
-SET_COLUMN.ITEM.UPDATE_COLUMN=\u30AB\u30E9\u30E0\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
+SET_COLUMN.ITEM.UPDATE_COLUMN=\u30AB\u30E9\u30E0\u3092\u66F4\u65B0
 SET_COLUMN.NAME=SET\u53E5
-NB_LINE_UPDATED.NAME=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3055\u308C\u305F\u884C\u6570
+NB_LINE_UPDATED.NAME=\u66F4\u65B0\u3055\u308C\u305F\u884C\u6570
 NB_LINE_INSERTED.NAME=\u633F\u5165\u3055\u308C\u305F\u884C\u6570
 NB_LINE_DELETED.NAME=\u524A\u9664\u3055\u308C\u305F\u884C\u6570
 USE_DIFFERENT_TABLE.NAME=\u7570\u306A\u308B\u30C6\u30FC\u30D6\u30EB\u540D\u3092\u4F7F\u7528
 DIFFERENT_TABLE_NAME.NAME=\u30C6\u30FC\u30D6\u30EB\u540D
-IS_TABLE_NAME_VARIABLE.NAME=\u63A5\u7D9A\u540D\u304B\u3089\u306E\u30C6\u30FC\u30D6\u30EB\u540D\u306F\u5909\u6570\u3067\u3042\u308B
+IS_TABLE_NAME_VARIABLE.NAME=\u63A5\u7D9A\u540D\u304B\u3089\u306E\u30C6\u30FC\u30D6\u30EB\u540D\u306F\u5909\u6570\u3067\u3059

main/plugins/org.talend.designer.components.localprovider/components/tELTVerticaOutput/tELTVerticaOutput_messages_ja.properties

@@ -8,7 +8,7 @@ ADD_COLS.ITEM.SQL=SQL\u5F0F
 ADD_COLS.NAME=\u8FFD\u52A0\u30AB\u30E9\u30E0
 DATA_ACTION.ITEM.DELETE=\u524A\u9664
 DATA_ACTION.ITEM.INSERT=\u633F\u5165
-DATA_ACTION.ITEM.UPDATE=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
+DATA_ACTION.ITEM.UPDATE=\u66F4\u65B0
 DATA_ACTION.NAME=\u30C7\u30FC\u30BF\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
 DBD-ODBC.INFO=ODBC\u306E\u3088\u3046\u306A\u63A5\u7D9A\u3067\u5FC5\u9808
 DBD-Oracle.INFO=Oracle\u3067\u5FC5\u9808
@@ -52,12 +52,12 @@ WHERE_CONDITIONS_TABLE.ITEM.FUNCTION.ITEM.BETWEEN=BETWEEN
 WHERE_CONDITIONS_TABLE.ITEM.FUNCTION.ITEM.LIKE=LIKE
 WHERE_CONDITIONS_TABLE.ITEM.FUNCTION.ITEM.IN=IN
 WHERE_CONDITIONS_TABLE.ITEM.VALUE_SQL=\u5024
-NB_LINE_UPDATED.NAME=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3055\u308C\u305F\u884C\u6570
+NB_LINE_UPDATED.NAME=\u66F4\u65B0\u3055\u308C\u305F\u884C\u6570
 NB_LINE_INSERTED.NAME=\u633F\u5165\u3055\u308C\u305F\u884C\u6570
 NB_LINE_DELETED.NAME=\u524A\u9664\u3055\u308C\u305F\u884C\u6570
 USE_DIFFERENT_TABLE.NAME=\u7570\u306A\u308B\u30C6\u30FC\u30D6\u30EB\u540D\u3092\u4F7F\u7528
 DIFFERENT_TABLE_NAME.NAME=\u30C6\u30FC\u30D6\u30EB\u540D
-IS_TABLE_NAME_VARIABLE.NAME=\u63A5\u7D9A\u540D\u304B\u3089\u306E\u30C6\u30FC\u30D6\u30EB\u540D\u306F\u5909\u6570\u3067\u3042\u308B
+IS_TABLE_NAME_VARIABLE.NAME=\u63A5\u7D9A\u540D\u304B\u3089\u306E\u30C6\u30FC\u30D6\u30EB\u540D\u306F\u5909\u6570\u3067\u3059
 DIRECT.NAME=\u76F4\u63A5
 SET_LABEL.NAME=SQL\u30E9\u30D9\u30EB\u306E\u8A2D\u5B9A
 SQL_LABEL.NAME=

main/plugins/org.talend.designer.components.localprovider/components/tExasolBulkExec/tExasolBulkExec_messages_ja.properties

@@ -11,8 +11,8 @@ DB_SCHEMA.NAME=\u30B9\u30AD\u30FC\u30DE
 PROPERTIES.NAME=\u8FFD\u52A0\u306EJDBC\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC
 PROPERTY.NAME=\u30D7\u30ED\u30D1\u30C6\u30A3\u30BF\u30A4\u30D7
 TABLE_ACTION.NAME=\u30C6\u30FC\u30D6\u30EB\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
-TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u3092\u30AF\u30EA\u30A2
-TABLE_ACTION.ITEM.TRUNCATE=\u30C6\u30FC\u30D6\u30EB\u3092\u5207\u308A\u6368\u3066
+TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u306E\u30AF\u30EA\u30A2
+TABLE_ACTION.ITEM.TRUNCATE=\u30C6\u30FC\u30D6\u30EB\u306E\u5207\u308A\u6368\u3066
 TABLE_ACTION.ITEM.CREATE=\u30C6\u30FC\u30D6\u30EB\u306E\u4F5C\u6210
 TABLE_ACTION.ITEM.CREATE_IF_NOT_EXISTS=\u5B58\u5728\u3057\u306A\u3044\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210
 TABLE_ACTION.ITEM.DROP_CREATE=\u30C9\u30ED\u30C3\u30D7\u3057\u3066\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210

main/plugins/org.talend.designer.components.localprovider/components/tExasolOutput/tExasolOutput_messages_ja.properties

@@ -20,26 +20,26 @@ CLEAR_TABLE.NAME=\u30C6\u30FC\u30D6\u30EB\u30C7\u30FC\u30BF\u306E\u30AF\u30EA\u3
 COMMIT_EVERY.NAME=\u30B3\u30DF\u30C3\u30C8\u3059\u308B\u9593\u9694
 DATA_ACTION.ITEM.DELETE=\u524A\u9664
 DATA_ACTION.ITEM.INSERT=\u633F\u5165
-DATA_ACTION.ITEM.INSERT_OR_UPDATE=\u633F\u5165\u307E\u305F\u306F\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
-DATA_ACTION.ITEM.UPDATE=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
-DATA_ACTION.ITEM.UPDATE_OR_INSERT=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u307E\u305F\u306F\u633F\u5165
+DATA_ACTION.ITEM.INSERT_OR_UPDATE=\u633F\u5165\u307E\u305F\u306F\u66F4\u65B0
+DATA_ACTION.ITEM.UPDATE=\u66F4\u65B0
+DATA_ACTION.ITEM.UPDATE_OR_INSERT=\u66F4\u65B0\u307E\u305F\u306F\u633F\u5165
 DATA_ACTION.NAME=\u30C7\u30FC\u30BF\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
 DBNAME.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9
 DIE_ON_ERROR.NAME=\u30A8\u30E9\u30FC\u767A\u751F\u6642\u306B\u5F37\u5236\u7D42\u4E86
 FAMILY=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9/EXASolution
 FIELD_OPTIONS.ITEM.DELETE_KEY=\u524A\u9664\u306E\u5165\u529B
 FIELD_OPTIONS.ITEM.INSERTABLE=\u633F\u5165\u53EF\u80FD
-FIELD_OPTIONS.ITEM.UPDATABLE=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u53EF\u80FD
-FIELD_OPTIONS.ITEM.UPDATE_KEY=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u306E\u5165\u529B
+FIELD_OPTIONS.ITEM.UPDATABLE=\u66F4\u65B0\u53EF\u80FD
+FIELD_OPTIONS.ITEM.UPDATE_KEY=\u66F4\u65B0\u306E\u5165\u529B
 FIELD_OPTIONS.NAME=\u30D5\u30A3\u30FC\u30EB\u30C9\u30AA\u30D7\u30B7\u30E7\u30F3
 HELP=org.talend.help.tExasolOutput
 DB_SCHEMA.NAME=\u30B9\u30AD\u30FC\u30DE\u540D
 PORT.NAME=\u30DD\u30FC\u30C8
 HOST.NAME=\u30DB\u30B9\u30C8
-LONG_NAME=EXA\u30C6\u30FC\u30D6\u30EB\u306B\u884C\u3092\u633F\u5165\u307E\u305F\u306F\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
+LONG_NAME=EXA\u30C6\u30FC\u30D6\u30EB\u306B\u884C\u3092\u633F\u5165\u307E\u305F\u306F\u66F4\u65B0
 NAME=tExasolOutput
 NB_LINE.NAME=\u884C\u6570
-NB_LINE_UPDATED.NAME=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3055\u308C\u305F\u884C\u6570
+NB_LINE_UPDATED.NAME=\u66F4\u65B0\u3055\u308C\u305F\u884C\u6570
 NB_LINE_INSERTED.NAME=\u633F\u5165\u3055\u308C\u305F\u884C\u6570
 NB_LINE_DELETED.NAME=\u524A\u9664\u3055\u308C\u305F\u884C\u6570
 NB_LINE_REJECTED.NAME=\u30EA\u30B8\u30A7\u30AF\u30C8\u3055\u308C\u305F\u884C\u6570
@@ -51,13 +51,13 @@ REJECT.MENU=\u30EA\u30B8\u30A7\u30AF\u30C8
 SCHEMA_FLOW.NAME=\u30B9\u30AD\u30FC\u30DE
 SCHEMA_REJECT.NAME=\u30B9\u30AD\u30FC\u30DE\u306E\u30EA\u30B8\u30A7\u30AF\u30C8
 TABLE.NAME=\u30C6\u30FC\u30D6\u30EB
-TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u3092\u30AF\u30EA\u30A2
+TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u306E\u30AF\u30EA\u30A2
 TABLE_ACTION.ITEM.CREATE=\u30C6\u30FC\u30D6\u30EB\u306E\u4F5C\u6210
 TABLE_ACTION.ITEM.CREATE_IF_NOT_EXISTS=\u5B58\u5728\u3057\u306A\u3044\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210
 TABLE_ACTION.ITEM.DROP_CREATE=\u30C9\u30ED\u30C3\u30D7\u3057\u3066\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210
 TABLE_ACTION.ITEM.DROP_IF_EXISTS_AND_CREATE=\u5B58\u5728\u3059\u308B\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u524A\u9664\u3057\u3066\u4F5C\u6210
 TABLE_ACTION.ITEM.NONE=\u306A\u3057
-TABLE_ACTION.ITEM.TRUNCATE=\u30C6\u30FC\u30D6\u30EB\u3092\u5207\u308A\u6368\u3066
+TABLE_ACTION.ITEM.TRUNCATE=\u30C6\u30FC\u30D6\u30EB\u306E\u5207\u308A\u6368\u3066
 TABLE_ACTION.NAME=\u30C6\u30FC\u30D6\u30EB\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
 USER.NAME=\u30E6\u30FC\u30B6\u30FC\u540D
 USE_COMMIT_CONTROL.NAME=\u30B3\u30DF\u30C3\u30C8\u5236\u5FA1\u3092\u4F7F\u3046

main/plugins/org.talend.designer.components.localprovider/components/tExasolRow/tExasolRow_messages_ja.properties

@@ -44,8 +44,8 @@ SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_VALUE=\u30D1\u30E9\u30E1\u30FC\u
 USE_NB_LINE.NAME=NB_LINE_\u306E\u4F7F\u7528
 USE_NB_LINE.ITEM.NONE=\u306A\u3057
 USE_NB_LINE.ITEM.NB_LINE_INSERTED=\u633F\u5165\u6E08\u307F
-USE_NB_LINE.ITEM.NB_LINE_UPDATED=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u6E08\u307F
+USE_NB_LINE.ITEM.NB_LINE_UPDATED=\u66F4\u65B0\u6E08\u307F
 USE_NB_LINE.ITEM.NB_LINE_DELETED=\u524A\u9664\u6E08\u307F
-NB_LINE_UPDATED.NAME=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3055\u308C\u305F\u884C\u6570
+NB_LINE_UPDATED.NAME=\u66F4\u65B0\u3055\u308C\u305F\u884C\u6570
 NB_LINE_INSERTED.NAME=\u633F\u5165\u3055\u308C\u305F\u884C\u6570
 NB_LINE_DELETED.NAME=\u524A\u9664\u3055\u308C\u305F\u884C\u6570

main/plugins/org.talend.designer.components.localprovider/components/tExtractJSONFields/tExtractJSONFields_end.javajet

@@ -11,8 +11,12 @@ CodeGeneratorArgument codeGenArgument = (CodeGeneratorArgument) argument;
 INode node = (INode)codeGenArgument.getArgument();
 boolean isLog4jEnabled = ("true").equals(ElementParameterParser.getValue(node.getProcess(), "__LOG4J_ACTIVATE__"));
 String cid = node.getUniqueName();
+String destination = ElementParameterParser.getValue(node, "__DESTINATION__");
+if(destination==null || "".equals(destination)){
+    destination = cid;
+}
 %>
-   globalMap.put("<%=cid%>_NB_LINE", nb_line_<%=cid%>);
+   globalMap.put("<%=destination %>_NB_LINE", nb_line_<%=cid%>);
 <%if(isLog4jEnabled){%>
 	log.debug("<%=cid%> - Extracted records count: " + nb_line_<%=cid %> + " .");
 <%}%>

main/plugins/org.talend.designer.components.localprovider/components/tExtractJSONFields/tExtractJSONFields_java.xml

@@ -152,6 +152,10 @@
             REQUIRED="true" SHOW="false">
         <DEFAULT>100</DEFAULT>
     </PARAMETER>
+    <PARAMETER NAME="DESTINATION" FIELD="TEXT" RAW="true" NUM_ROW="20"
+            REQUIRED="true" SHOW="false">
+		<DEFAULT>tExtractJSONFields_1</DEFAULT>
+	</PARAMETER>
   </PARAMETERS>
 
 	<ADVANCED_PARAMETERS>
@@ -174,7 +178,7 @@
     <IMPORTS>
     		<IMPORT NAME="Java_DOM4J2" MODULE="dom4j-2.1.3.jar" MVN="mvn:org.dom4j/dom4j/2.1.3" REQUIRED_IF="READ_BY == 'XPATH'" BundleID="" />
             <IMPORT NAME="Java_JAXEN_1.1.6" MODULE="jaxen-1.1.6.jar" MVN="mvn:jaxen/jaxen/1.1.6" REQUIRED_IF="READ_BY == 'XPATH'" BundleID="" />
-            <IMPORT NAME="json-lib" MODULE="json-lib-2.4.7-talend.jar" MVN="mvn:net.sf.json-lib/json-lib/2.4.7-talend" REQUIRED_IF="READ_BY == 'XPATH'" />
+            <IMPORT NAME="json-lib" MODULE="json-lib-2.4.6-talend.jar" MVN="mvn:net.sf.json-lib/json-lib/2.4.6-talend" REQUIRED_IF="READ_BY == 'XPATH'" />
             <IMPORT NAME="commons_lang" MODULE="commons-lang-2.6.jar" MVN="mvn:commons-lang/commons-lang/2.6"  UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-lang-2.6.jar" REQUIRED_IF="READ_BY == 'XPATH'" />
             <IMPORT NAME="commons_logging" MODULE="commons-logging-1.1.1.jar" MVN="mvn:org.talend.libraries/commons-logging-1.1.1/6.0.0"  UrlPath="platform:/base/plugins/org.apache.commons.logging_1.1.1.v201101211721.jar" REQUIRED_IF="READ_BY == 'XPATH'" />
             <IMPORT NAME="ezmorph" MODULE="ezmorph-1.0.6.jar" MVN="mvn:org.talend.libraries/ezmorph-1.0.6/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.jackson/lib/ezmorph-1.0.6.jar" REQUIRED_IF="READ_BY == 'XPATH'" />

main/plugins/org.talend.designer.components.localprovider/components/tFileArchive/tFileArchive_java.xml

@@ -132,8 +132,9 @@
    <CODEGENERATION>
      <IMPORTS>
        <IMPORT NAME="commons-compress-1.21" MODULE="commons-compress-1.21.jar" MVN="mvn:org.apache.commons/commons-compress/1.21" REQUIRED="true" />
-       <IMPORT NAME="zip4j-2.10.0.jar" MODULE="zip4j-2.10.0.jar" MVN="mvn:net.lingala.zip4j/zip4j/2.10.0" REQUIRED="true" />
-       <IMPORT NAME="talendzip-1.3.jar" MODULE="talendzip-1.3.jar" MVN="mvn:org.talend.components/talendzip/1.3" UrlPath="platform:/plugin/org.talend.libraries.custom/lib/talendzip-1.3.jar" REQUIRED="true" />
+       <IMPORT NAME="Encrypt-Zip" MODULE="checkArchive-1.2-20210901.jar" MVN="mvn:org.talend.components/checkArchive/1.2-20210901" UrlPath="platform:/plugin/org.talend.libraries.custom/lib/checkArchive-1.2-20210901.jar" REQUIRED="true" />
+       <IMPORT NAME="zip4j-1.3.3.jar" MODULE="zip4j-1.3.3.jar" MVN="mvn:net.lingala.zip4j/zip4j/1.3.3" REQUIRED="true" />
+       <IMPORT NAME="talendzip-1.2-20210901.jar" MODULE="talendzip-1.2-20210901.jar" MVN="mvn:org.talend.components/talendzip/1.2-20210901" UrlPath="platform:/plugin/org.talend.libraries.custom/lib/talendzip-1.2-20210901.jar" REQUIRED="true" />
      </IMPORTS>
    </CODEGENERATION>
 

main/plugins/org.talend.designer.components.localprovider/components/tFileArchive/tFileArchive_main.javajet

@@ -29,8 +29,7 @@
 
 	String zip64Mode = ElementParameterParser.getValue(node, "__ZIP64_MODE__");
 	String encryptMethod = ElementParameterParser.getValue(node, "__ENCRYPT_METHOD__");
-	int aesKeyStrength = "AES_STRENGTH_256".equals(ElementParameterParser.getValue(node, "__AES_KEY_STRENGTH__"))?3:1;
-
+	String aesKeyStrength = ElementParameterParser.getValue(node, "__AES_KEY_STRENGTH__");
 
 	String archiveFormat = ElementParameterParser.getValue(node, "__ARCHIVE_FORMAT__");
 	String sourceFile = ElementParameterParser.getValue(node, "__SOURCE_FILE__");
@@ -110,17 +109,12 @@
 	   if(!"JAVA_ENCRYPT".equals(encryptMethod)){
 	   %>
 	      zip_<%=cid%>.setUseZip4jEncryption(true);
-
+	      zip_<%=cid%>.setEncryptionMethod(net.lingala.zip4j.util.Zip4jConstants.<%=encryptMethod%>);
 	      <%
 		  if("ENC_METHOD_AES".equals(encryptMethod)){
 		  %>
-		     zip_<%=cid%>.setEncryptionMethod("AES");
-	         zip_<%=cid%>.setAesKeyStrength(<%=aesKeyStrength%>);
+	         zip_<%=cid%>.setAesKeyStrength(net.lingala.zip4j.util.Zip4jConstants.<%=aesKeyStrength%>);
 	      <%
-	   	  }else if("ENC_METHOD_STANDARD".equals(encryptMethod)){
-	   	  %>
-	   	  zip_<%=cid%>.setEncryptionMethod("ZIP_STANDARD");
-	   	  <%
 	   	  }
 	   	}else{
 	   	%>

main/plugins/org.talend.designer.components.localprovider/components/tFileFetch/tFileFetch_java.xml

@@ -1,446 +1,441 @@
 <COMPONENT>
-    <HEADER
-            PLATEFORM="ALL"
-            SERIAL=""
-            VERSION="0.101"
-            STATUS="ALPHA"
-            COMPATIBILITY="ALL"
-            AUTHOR="Talend"
-            RELEASE_DATE="20050320A"
-            STARTABLE="true"
-            PARTITIONING="AUTO"
-            LOG4J_ENABLED="true"
+  <HEADER
+    PLATEFORM="ALL"
+       SERIAL=""
+      VERSION="0.101"
+       STATUS="ALPHA"
+COMPATIBILITY="ALL"
+       AUTHOR="Talend"
+ RELEASE_DATE="20050320A"
+    STARTABLE="true"
+	PARTITIONING="AUTO"
+  LOG4J_ENABLED="true"
+  >
+    <SIGNATURE></SIGNATURE>
+  </HEADER>
+
+  <FAMILIES>
+    <FAMILY>Internet</FAMILY>
+  </FAMILIES>
+
+  <DOCUMENTATION>
+    <URL/>
+  </DOCUMENTATION>
+
+  <CONNECTORS>
+    <CONNECTOR CTYPE="FLOW" MAX_INPUT="1" MAX_OUTPUT="1"/>
+    <CONNECTOR CTYPE="ITERATE" MAX_OUTPUT="0" MAX_INPUT="1"/>
+    <CONNECTOR CTYPE="SUBJOB_OK" MAX_INPUT="1" />
+    <CONNECTOR CTYPE="SUBJOB_ERROR" MAX_INPUT="1" />
+    <CONNECTOR CTYPE="COMPONENT_OK"/>
+    <CONNECTOR CTYPE="COMPONENT_ERROR"/>
+    <CONNECTOR CTYPE="RUN_IF"/>
+  </CONNECTORS>
+
+  <PARAMETERS>
+
+  <PARAMETER
+      NAME="PROTO"
+      FIELD="CLOSED_LIST"
+      NUM_ROW="10"
     >
-        <SIGNATURE></SIGNATURE>
-    </HEADER>
+      <ITEMS DEFAULT="HTTP_PROTO">
+        <ITEM NAME="HTTP_PROTO"   VALUE="http" />
+        <ITEM NAME="HTTPS_PROTO"   VALUE="https" />
+        <ITEM NAME="FTP_PROTO"   VALUE="ftp" />
+        <ITEM NAME="SAMBA_PROTO" VALUE="smb" />
+      </ITEMS>
+    </PARAMETER>
 
-    <FAMILIES>
-        <FAMILY>Internet</FAMILY>
-    </FAMILIES>
+  <PARAMETER
+  	NAME="POST"
+  	FIELD="CHECK"
+  	NUM_ROW="50"
+  	SHOW_IF="(PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')"
+  >
+  <DEFAULT>true</DEFAULT>
+  </PARAMETER>
 
-    <DOCUMENTATION>
-        <URL/>
-    </DOCUMENTATION>
+  <PARAMETER
+     NAME="URI"
+     FIELD="TEXT"
+     REQUIRED="true"
+     NUM_ROW="20"
+     SHOW_IF="PROTO!='SAMBA_PROTO'"
+  >
+   <DEFAULT>"http://talendforge.org/file_fetch.txt"</DEFAULT>
+  </PARAMETER>
 
-    <CONNECTORS>
-        <CONNECTOR CTYPE="FLOW" MAX_INPUT="1" MAX_OUTPUT="1"/>
-        <CONNECTOR CTYPE="ITERATE" MAX_OUTPUT="0" MAX_INPUT="1"/>
-        <CONNECTOR CTYPE="SUBJOB_OK" MAX_INPUT="1" />
-        <CONNECTOR CTYPE="SUBJOB_ERROR" MAX_INPUT="1" />
-        <CONNECTOR CTYPE="COMPONENT_OK"/>
-        <CONNECTOR CTYPE="COMPONENT_ERROR"/>
-        <CONNECTOR CTYPE="RUN_IF"/>
-    </CONNECTORS>
+  <PARAMETER
+  	NAME="USE_CACHE"
+  	FIELD="CHECK"
+  	NUM_ROW="21"
+  >
+  <DEFAULT>false</DEFAULT>
+  </PARAMETER>
 
-    <PARAMETERS>
+  <PARAMETER
+     NAME="SMB_URI"
+     FIELD="TEXT"
+     REQUIRED="true"
+     NUM_ROW="20"
+     SHOW_IF="PROTO=='SAMBA_PROTO'"
+  >
+   <DEFAULT>"smb://host/dir/remoteFileName.txt"</DEFAULT>
+  </PARAMETER>
 
-        <PARAMETER
-                NAME="PROTO"
-                FIELD="CLOSED_LIST"
-                NUM_ROW="10"
+  <PARAMETER
+     NAME="DIRECTORY"
+     FIELD="DIRECTORY"
+     NUM_ROW="30"
+     REQUIRED="true"
+     SHOW_IF=" USE_CACHE == 'false'"
+  >
+    <DEFAULT>"C:"</DEFAULT>
+  </PARAMETER>
+
+  <PARAMETER
+  	NAME="MAKEDIRS"
+  	FIELD="CHECK"
+  	NUM_ROW="35"
+  	SHOW_IF="(PROTO != 'SAMBA_PROTO') AND (USE_CACHE == 'false')"
+  >
+  <DEFAULT>false</DEFAULT>
+  </PARAMETER>
+
+  <PARAMETER
+     NAME="FILENAME"
+     FIELD="TEXT"
+     REQUIRED="true"
+     NUM_ROW="40"
+     SHOW_IF=" USE_CACHE == 'false'"
+  >
+    <DEFAULT>""</DEFAULT>
+  </PARAMETER>
+
+  <PARAMETER
+  	NAME="ADD_HEADER"
+  	FIELD="CHECK"
+  	NUM_ROW="45"
+  	SHOW_IF="(PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')"
+  >
+  <DEFAULT>false</DEFAULT>
+  </PARAMETER>
+
+  <PARAMETER
+     NAME="HEADERS"
+     FIELD="TABLE" NUM_ROW="46"
+     NB_LINES="5"
+     SHOW_IF="((PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')) AND (ADD_HEADER == 'true')"
+  >
+     <ITEMS>
+       <ITEM NAME="HEADER_NAME" />
+       <ITEM NAME="HEADER_VALUE"/>
+     </ITEMS>
+   </PARAMETER>
+
+   <PARAMETER
+     NAME="SMB_DOMAIN"
+     FIELD="TEXT"
+     REQUIRED="true"
+     NUM_ROW="25"
+     SHOW_IF="PROTO=='SAMBA_PROTO'"
+  >
+    <DEFAULT>"domain"</DEFAULT>
+  </PARAMETER>
+
+     <PARAMETER
+     NAME="SMB_USERNAME"
+     FIELD="TEXT"
+     REQUIRED="true"
+     NUM_ROW="25"
+     SHOW_IF="PROTO=='SAMBA_PROTO'"
+  >
+    <DEFAULT>"username"</DEFAULT>
+  </PARAMETER>
+
+     <PARAMETER
+     NAME="SMB_PASSWORD"
+     FIELD="PASSWORD"
+     REQUIRED="true"
+     NUM_ROW="25"
+     SHOW_IF="PROTO=='SAMBA_PROTO'"
+  >
+    <DEFAULT>"password"</DEFAULT>
+  </PARAMETER>
+
+   <PARAMETER
+     NAME="DIE_ON_ERROR"
+     FIELD="CHECK"
+     NUM_ROW="50"
+     SHOW_IF="PROTO!='SAMBA_PROTO'"
+  >
+  <DEFAULT>true</DEFAULT>
+  </PARAMETER>
+
+  <PARAMETER
+     NAME="COMMON_PARAMS"
+     FIELD="TABLE" NUM_ROW="60"
+     NB_LINES="5"
+     SHOW_IF="((PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')) AND (POST == 'true')"
+  >
+     <ITEMS>
+       <ITEM NAME="COMMON_PARAMS_NAME" />
+       <ITEM NAME="COMMON_PARAMS_VALUE"/>
+     </ITEMS>
+   </PARAMETER>
+
+   <PARAMETER
+     NAME="READ_COOKIE"
+     FIELD="CHECK"
+     NUM_ROW="70"
+  >
+  <DEFAULT>false</DEFAULT>
+  </PARAMETER>
+
+   <PARAMETER
+     NAME="SAVE_COOKIE"
+     FIELD="CHECK"
+     NUM_ROW="70"
+  >
+  <DEFAULT>false</DEFAULT>
+  </PARAMETER>
+
+  <PARAMETER
+     NAME="COOKIE_DIR"
+     FIELD="FILE"
+     NUM_ROW="71"
+     REQUIRED="true"
+     SHOW_IF="(SAVE_COOKIE == 'true') OR (READ_COOKIE == 'true')"
+  >
+    <DEFAULT>"C:/cookie"</DEFAULT>
+  </PARAMETER>
+
+  <PARAMETER
+		NAME="COOKIE_POLICY"
+		FIELD="CLOSED_LIST"
+		NUM_ROW="72"
+		SHOW_IF="(SAVE_COOKIE == 'true') OR (READ_COOKIE == 'true')"
+	>
+	<ITEMS DEFAULT="DEFAULT">
+		<ITEM NAME="DEFAULT"   VALUE="DEFAULT" />
+		<ITEM NAME="BROWSER_COMPATIBILITY"   VALUE="BROWSER_COMPATIBILITY" />
+		<ITEM NAME="NETSCAPE"   VALUE="NETSCAPE" />
+		<ITEM NAME="RFC_2109" VALUE="RFC_2109" />
+		<!-- RFC_2965 is not support in commons-httpclient-3.0.1.jar -->
+		<!-- <ITEM NAME="RFC_2965" VALUE="RFC_2965" />  -->
+	</ITEMS>
+	</PARAMETER>
+
+  <PARAMETER
+		NAME="SINGLE_COOKIE"
+		FIELD="CHECK"
+		NUM_ROW="73"
+		SHOW_IF="(SAVE_COOKIE == 'true') OR (READ_COOKIE == 'true')"
+  >
+  <DEFAULT>false</DEFAULT>
+  </PARAMETER>
+  </PARAMETERS>
+
+   <ADVANCED_PARAMETERS>
+	<PARAMETER
+    	NAME="ENCODE_URI"
+    	FIELD="CHECK"
+    	NUM_ROW="6"
+    	SHOW_IF="(PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')"
+    >
+	<DEFAULT>false</DEFAULT>
+	</PARAMETER>
+	<PARAMETER
+      NAME="COMMON_PARAMS_CHARSET"
+      FIELD="OPENED_LIST"
+      NUM_ROW="7"
+      SHOW_IF="((PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')) AND (POST == 'true')"
+    >
+        <ITEMS DEFAULT="UTF8">
+          <ITEM NAME="USASCII" VALUE="&quot;US-ASCII&quot;" />
+          <ITEM NAME="UTF8"    VALUE="&quot;UTF-8&quot;" />
+          <ITEM NAME="WIN1252" VALUE="&quot;windows-1252&quot;" />
+      </ITEMS>
+    </PARAMETER>
+     <PARAMETER
+    	NAME="PRINT"
+    	FIELD="CHECK"
+    	NUM_ROW="8"
+    	SHOW_IF="(PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')"
+    >
+    </PARAMETER>
+
+    <PARAMETER
+      NAME="TIMEOUT"
+      FIELD="TEXT"
+      REQUIRED="false"
+      NUM_ROW="5"
+      SHOW_IF="(PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')"
+    >
+      <DEFAULT>30000</DEFAULT>
+    </PARAMETER>
+
+    <PARAMETER
+      NAME="UPLOAD"
+      FIELD="CHECK"
+      NUM_ROW="10"
+      SHOW_IF="((PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')) AND (POST == 'true')"
+    >
+      <DEFAULT>false</DEFAULT>
+    </PARAMETER>
+
+    <PARAMETER
+      NAME="FILE_PARAMS"
+      FIELD="TABLE"
+      NUM_ROW="20"
+      NB_LINES="8"
+	  SHOW_IF="((PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')) AND (POST == 'true') AND (UPLOAD == 'true')"
+    >
+      <ITEMS>
+        <ITEM NAME="FILE_PARAMS_NAME" />
+        <ITEM NAME="FILE_PARAMS_VALUE"/>
+		<ITEM NAME="FILE_PARAMS_CONTENT_TYPE" VALUE="&quot;application/octet-stream&quot;"/>
+		<ITEM NAME="FILE_PARAMS_CHARSET" VALUE="&quot;ISO-8859-1&quot;"/>
+      </ITEMS>
+    </PARAMETER>
+    
+    <PARAMETER
+       NAME="USE_PROXY"
+       FIELD="CHECK"
+       REQUIRED="true"
+	   NUM_ROW="30"
+	   SHOW_IF="PROTO!='SAMBA_PROTO'"
+	   REPOSITORY_VALUE="UES_PROXY">
+	   <DEFAULT>false</DEFAULT>
+	</PARAMETER>
+
+	<PARAMETER
+		NAME="PROXY_HOST"
+		FIELD="TEXT"
+		NUM_ROW="35"
+		SHOW_IF="USE_PROXY == 'true'"
+		REPOSITORY_VALUE="PROXY_HOST">
+		<DEFAULT>"127.0.0.1"</DEFAULT>
+	</PARAMETER>
+
+	<PARAMETER
+		NAME="PROXY_PORT"
+		FIELD="TEXT"
+		NUM_ROW="36"
+		SHOW_IF="USE_PROXY == 'true'"
+		REPOSITORY_VALUE="PROXY_PORT">
+		<DEFAULT>"8080"</DEFAULT>
+	</PARAMETER>
+
+	<PARAMETER
+		NAME="PROXY_USERNAME"
+		FIELD="TEXT"
+		NUM_ROW="37"
+		SHOW_IF="USE_PROXY == 'true'"
+		REPOSITORY_VALUE="PROXY_USERNAME">
+		<DEFAULT>""</DEFAULT>
+	</PARAMETER>
+
+	<PARAMETER
+		NAME="PROXY_PASSWORD"
+		FIELD="PASSWORD"
+		NUM_ROW="38"
+		SHOW_IF="USE_PROXY == 'true'"
+		REPOSITORY_VALUE="PROXY_PASSWORD">
+		<DEFAULT>""</DEFAULT>
+	</PARAMETER>
+
+	<PARAMETER
+		NAME="PROXY_NTLM"
+		FIELD="CHECK"
+		NUM_ROW="39"
+		SHOW_IF="PROTO!='SAMBA_PROTO'"
+		REPOSITORY_VALUE="PROXY_NTLM"
+	 >
+		<DEFAULT>false</DEFAULT>
+	</PARAMETER>
+
+	<PARAMETER
+		NAME="PROXY_DOMAIN"
+		FIELD="TEXT"
+		NUM_ROW="39"
+		SHOW_IF="(PROTO!='SAMBA_PROTO') and (PROXY_NTLM == 'true')"
+		REPOSITORY_VALUE="PROXY_DOMAIN"
         >
-            <ITEMS DEFAULT="HTTP_PROTO">
-                <ITEM NAME="HTTP_PROTO"   VALUE="http" />
-                <ITEM NAME="HTTPS_PROTO"   VALUE="https" />
-                <ITEM NAME="FTP_PROTO"   VALUE="ftp" />
-                <ITEM NAME="SAMBA_PROTO" VALUE="smb" />
-            </ITEMS>
-        </PARAMETER>
+		<DEFAULT>""</DEFAULT>
+	</PARAMETER>
 
-        <PARAMETER
-                NAME="POST"
-                FIELD="CHECK"
-                NUM_ROW="50"
-                SHOW_IF="(PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')"
-        >
-            <DEFAULT>true</DEFAULT>
-        </PARAMETER>
+	<PARAMETER
+		NAME="NEED_AUTH"
+		FIELD="CHECK"
+		REQUIRED="true"
+		NUM_ROW="45"
+		SHOW_IF="(PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')"
 
-        <PARAMETER
-                NAME="URI"
-                FIELD="TEXT"
-                REQUIRED="true"
-                NUM_ROW="20"
-                SHOW_IF="PROTO!='SAMBA_PROTO'"
-        >
-            <DEFAULT>"http://talendforge.org/file_fetch.txt"</DEFAULT>
-        </PARAMETER>
+	 >
+		<DEFAULT>false</DEFAULT>
+	</PARAMETER>
 
-        <PARAMETER
-                NAME="USE_CACHE"
-                FIELD="CHECK"
-                NUM_ROW="21"
-        >
-            <DEFAULT>false</DEFAULT>
-        </PARAMETER>
+    <PARAMETER
+      NAME="AUTH_USERNAME"
+      FIELD="TEXT"
+      REQUIRED="false"
+      NUM_ROW="50"
+      SHOW_IF="((PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')) AND (NEED_AUTH == 'true')"
+    >
+      <DEFAULT>"username"</DEFAULT>
+    </PARAMETER>
 
-        <PARAMETER
-                NAME="SMB_URI"
-                FIELD="TEXT"
-                REQUIRED="true"
-                NUM_ROW="20"
-                SHOW_IF="PROTO=='SAMBA_PROTO'"
-        >
-            <DEFAULT>"smb://host/dir/remoteFileName.txt"</DEFAULT>
-        </PARAMETER>
+    <PARAMETER
+      NAME="AUTH_PASSWORD"
+      FIELD="PASSWORD"
+      REQUIRED="false"
+      NUM_ROW="50"
+      SHOW_IF="((PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')) AND (NEED_AUTH == 'true')"
+    >
+      <DEFAULT>"password"</DEFAULT>
+    </PARAMETER>
 
-        <PARAMETER
-                NAME="DIRECTORY"
-                FIELD="DIRECTORY"
-                NUM_ROW="30"
-                REQUIRED="true"
-                SHOW_IF=" USE_CACHE == 'false'"
-        >
-            <DEFAULT>"C:"</DEFAULT>
-        </PARAMETER>
-
-        <PARAMETER
-                NAME="MAKEDIRS"
-                FIELD="CHECK"
-                NUM_ROW="35"
-                SHOW_IF="(PROTO != 'SAMBA_PROTO') AND (USE_CACHE == 'false')"
-        >
-            <DEFAULT>false</DEFAULT>
-        </PARAMETER>
-
-        <PARAMETER
-                NAME="FILENAME"
-                FIELD="TEXT"
-                REQUIRED="true"
-                NUM_ROW="40"
-                SHOW_IF=" USE_CACHE == 'false'"
-        >
-            <DEFAULT>""</DEFAULT>
-        </PARAMETER>
-
-        <PARAMETER
-                NAME="ADD_HEADER"
-                FIELD="CHECK"
-                NUM_ROW="45"
-                SHOW_IF="(PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')"
-        >
-            <DEFAULT>false</DEFAULT>
-        </PARAMETER>
-
-        <PARAMETER
-                NAME="HEADERS"
-                FIELD="TABLE" NUM_ROW="46"
-                NB_LINES="5"
-                SHOW_IF="((PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')) AND (ADD_HEADER == 'true')"
-        >
-            <ITEMS>
-                <ITEM NAME="HEADER_NAME" />
-                <ITEM NAME="HEADER_VALUE"/>
-            </ITEMS>
-        </PARAMETER>
-
-        <PARAMETER
-                NAME="SMB_DOMAIN"
-                FIELD="TEXT"
-                REQUIRED="true"
-                NUM_ROW="25"
-                SHOW_IF="PROTO=='SAMBA_PROTO'"
-        >
-            <DEFAULT>"domain"</DEFAULT>
-        </PARAMETER>
-
-        <PARAMETER
-                NAME="SMB_USERNAME"
-                FIELD="TEXT"
-                REQUIRED="true"
-                NUM_ROW="25"
-                SHOW_IF="PROTO=='SAMBA_PROTO'"
-        >
-            <DEFAULT>"username"</DEFAULT>
-        </PARAMETER>
-
-        <PARAMETER
-                NAME="SMB_PASSWORD"
-                FIELD="PASSWORD"
-                REQUIRED="true"
-                NUM_ROW="25"
-                SHOW_IF="PROTO=='SAMBA_PROTO'"
-        >
-            <DEFAULT>"password"</DEFAULT>
-        </PARAMETER>
-
-        <PARAMETER
-                NAME="DIE_ON_ERROR"
-                FIELD="CHECK"
-                NUM_ROW="50"
-                SHOW_IF="PROTO!='SAMBA_PROTO'"
-        >
-            <DEFAULT>true</DEFAULT>
-        </PARAMETER>
-
-        <PARAMETER
-                NAME="COMMON_PARAMS"
-                FIELD="TABLE" NUM_ROW="60"
-                NB_LINES="5"
-                SHOW_IF="((PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')) AND (POST == 'true')"
-        >
-            <ITEMS>
-                <ITEM NAME="COMMON_PARAMS_NAME" />
-                <ITEM NAME="COMMON_PARAMS_VALUE"/>
-            </ITEMS>
-        </PARAMETER>
-
-        <PARAMETER
-                NAME="READ_COOKIE"
-                FIELD="CHECK"
-                NUM_ROW="70"
-                SHOW_IF="((PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO'))"
-        >
-            <DEFAULT>false</DEFAULT>
-        </PARAMETER>
-
-        <PARAMETER
-                NAME="SAVE_COOKIE"
-                FIELD="CHECK"
-                NUM_ROW="70"
-                SHOW_IF="((PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO'))"
-        >
-            <DEFAULT>false</DEFAULT>
-        </PARAMETER>
-
-        <PARAMETER
-                NAME="COOKIE_DIR"
-                FIELD="FILE"
-                NUM_ROW="71"
-                REQUIRED="true"
-                SHOW_IF="((PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')) AND ((SAVE_COOKIE == 'true') OR (READ_COOKIE == 'true'))"
-        >
-            <DEFAULT>"C:/cookie"</DEFAULT>
-        </PARAMETER>
-
-        <PARAMETER
-                NAME="COOKIE_POLICY"
-                FIELD="CLOSED_LIST"
-                NUM_ROW="72"
-                SHOW_IF="((PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')) AND ((SAVE_COOKIE == 'true') OR (READ_COOKIE == 'true'))"
-        >
-            <ITEMS DEFAULT="DEFAULT">
-                <ITEM NAME="DEFAULT"   VALUE="DEFAULT" />
-                <ITEM NAME="BROWSER_COMPATIBILITY"   VALUE="BROWSER_COMPATIBILITY" />
-                <ITEM NAME="NETSCAPE"   VALUE="NETSCAPE" />
-                <ITEM NAME="RFC_2109" VALUE="RFC_2109" />
-                <!-- RFC_2965 is not support in commons-httpclient-3.0.1.jar -->
-                <!-- <ITEM NAME="RFC_2965" VALUE="RFC_2965" />  -->
-            </ITEMS>
-        </PARAMETER>
-
-        <PARAMETER
-                NAME="SINGLE_COOKIE"
-                FIELD="CHECK"
-                NUM_ROW="73"
-                SHOW_IF="((PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')) AND ((SAVE_COOKIE == 'true') OR (READ_COOKIE == 'true'))"
-        >
-            <DEFAULT>false</DEFAULT>
-        </PARAMETER>
-    </PARAMETERS>
-
-    <ADVANCED_PARAMETERS>
-        <PARAMETER
-                NAME="ENCODE_URI"
-                FIELD="CHECK"
-                NUM_ROW="6"
-                SHOW_IF="(PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')"
-        >
-            <DEFAULT>false</DEFAULT>
-        </PARAMETER>
-        <PARAMETER
-                NAME="COMMON_PARAMS_CHARSET"
-                FIELD="OPENED_LIST"
-                NUM_ROW="7"
-                SHOW_IF="((PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')) AND (POST == 'true')"
-        >
-            <ITEMS DEFAULT="UTF8">
-                <ITEM NAME="USASCII" VALUE="&quot;US-ASCII&quot;" />
-                <ITEM NAME="UTF8"    VALUE="&quot;UTF-8&quot;" />
-                <ITEM NAME="WIN1252" VALUE="&quot;windows-1252&quot;" />
-            </ITEMS>
-        </PARAMETER>
-        <PARAMETER
-                NAME="PRINT"
-                FIELD="CHECK"
-                NUM_ROW="8"
-                SHOW_IF="(PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')"
-        >
-        </PARAMETER>
-
-        <PARAMETER
-                NAME="TIMEOUT"
-                FIELD="TEXT"
-                REQUIRED="false"
-                NUM_ROW="5"
-                SHOW_IF="(PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')"
-        >
-            <DEFAULT>30000</DEFAULT>
-        </PARAMETER>
-
-        <PARAMETER
-                NAME="UPLOAD"
-                FIELD="CHECK"
-                NUM_ROW="10"
-                SHOW_IF="((PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')) AND (POST == 'true')"
-        >
-            <DEFAULT>false</DEFAULT>
-        </PARAMETER>
-
-        <PARAMETER
-                NAME="FILE_PARAMS"
-                FIELD="TABLE"
-                NUM_ROW="20"
-                NB_LINES="8"
-                SHOW_IF="((PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')) AND (POST == 'true') AND (UPLOAD == 'true')"
-        >
-            <ITEMS>
-                <ITEM NAME="FILE_PARAMS_NAME" />
-                <ITEM NAME="FILE_PARAMS_VALUE"/>
-                <ITEM NAME="FILE_PARAMS_CONTENT_TYPE" VALUE="&quot;application/octet-stream&quot;"/>
-                <ITEM NAME="FILE_PARAMS_CHARSET" VALUE="&quot;ISO-8859-1&quot;"/>
-            </ITEMS>
-        </PARAMETER>
-
-        <PARAMETER
-                NAME="USE_PROXY"
-                FIELD="CHECK"
-                REQUIRED="true"
-                NUM_ROW="30"
-                SHOW_IF="PROTO!='SAMBA_PROTO'"
-                REPOSITORY_VALUE="UES_PROXY">
-            <DEFAULT>false</DEFAULT>
-        </PARAMETER>
-
-        <PARAMETER
-                NAME="PROXY_HOST"
-                FIELD="TEXT"
-                NUM_ROW="35"
-                SHOW_IF="USE_PROXY == 'true'"
-                REPOSITORY_VALUE="PROXY_HOST">
-            <DEFAULT>"127.0.0.1"</DEFAULT>
-        </PARAMETER>
-
-        <PARAMETER
-                NAME="PROXY_PORT"
-                FIELD="TEXT"
-                NUM_ROW="36"
-                SHOW_IF="USE_PROXY == 'true'"
-                REPOSITORY_VALUE="PROXY_PORT">
-            <DEFAULT>"8080"</DEFAULT>
-        </PARAMETER>
-
-        <PARAMETER
-                NAME="PROXY_USERNAME"
-                FIELD="TEXT"
-                NUM_ROW="37"
-                SHOW_IF="USE_PROXY == 'true'"
-                REPOSITORY_VALUE="PROXY_USERNAME">
-            <DEFAULT>""</DEFAULT>
-        </PARAMETER>
-
-        <PARAMETER
-                NAME="PROXY_PASSWORD"
-                FIELD="PASSWORD"
-                NUM_ROW="38"
-                SHOW_IF="USE_PROXY == 'true'"
-                REPOSITORY_VALUE="PROXY_PASSWORD">
-            <DEFAULT>""</DEFAULT>
-        </PARAMETER>
-
-        <PARAMETER
-                NAME="PROXY_NTLM"
-                FIELD="CHECK"
-                NUM_ROW="39"
-                SHOW_IF="((PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO'))"
-                REPOSITORY_VALUE="PROXY_NTLM"
-        >
-            <DEFAULT>false</DEFAULT>
-        </PARAMETER>
-
-        <PARAMETER
-                NAME="PROXY_DOMAIN"
-                FIELD="TEXT"
-                NUM_ROW="39"
-                SHOW_IF="((PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')) and (PROXY_NTLM == 'true')"
-                REPOSITORY_VALUE="PROXY_DOMAIN"
-        >
-            <DEFAULT>""</DEFAULT>
-        </PARAMETER>
-
-        <PARAMETER
-                NAME="NEED_AUTH"
-                FIELD="CHECK"
-                REQUIRED="true"
-                NUM_ROW="45"
-                SHOW_IF="(PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')"
-
-        >
-            <DEFAULT>false</DEFAULT>
-        </PARAMETER>
-
-        <PARAMETER
-                NAME="AUTH_USERNAME"
-                FIELD="TEXT"
-                REQUIRED="false"
-                NUM_ROW="50"
-                SHOW_IF="((PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')) AND (NEED_AUTH == 'true')"
-        >
-            <DEFAULT>"username"</DEFAULT>
-        </PARAMETER>
-
-        <PARAMETER
-                NAME="AUTH_PASSWORD"
-                FIELD="PASSWORD"
-                REQUIRED="false"
-                NUM_ROW="50"
-                SHOW_IF="((PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')) AND (NEED_AUTH == 'true')"
-        >
-            <DEFAULT>"password"</DEFAULT>
-        </PARAMETER>
-
-        <PARAMETER
-                NAME="REDIRECT"
-                FIELD="CHECK"
-                REQUIRED="true"
-                SHOW_IF="((PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO'))"
-                NUM_ROW="60"
-        >
-            <DEFAULT>false</DEFAULT>
-        </PARAMETER>
-        <PARAMETER
-                NAME="REDIRECT_302_AS_303"
-                FIELD="CHECK"
-                REQUIRED="true"
-                SHOW_IF="((PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')) AND (REDIRECT == 'true')"
-                NUM_ROW="60"
-        >
-            <DEFAULT>false</DEFAULT>
-        </PARAMETER>
-        <PARAMETER
-                NAME="TRUST_ALL_SERVER"
-                FIELD="CHECK"
-                REQUIRED="true"
-                SHOW_IF="PROTO == 'HTTPS_PROTO'"
-                NUM_ROW="70"
-        >
-            <DEFAULT>false</DEFAULT>
-        </PARAMETER>
+	<PARAMETER
+		NAME="REDIRECT"
+		FIELD="CHECK"
+		REQUIRED="true"
+		NUM_ROW="60"
+	 >
+		<DEFAULT>false</DEFAULT>
+	</PARAMETER>
+   <PARAMETER
+           NAME="REDIRECT_302_AS_303"
+           FIELD="CHECK"
+           REQUIRED="true"
+           SHOW_IF="REDIRECT == 'true'"
+           NUM_ROW="60"
+   >
+       <DEFAULT>false</DEFAULT>
+   </PARAMETER>
+   <PARAMETER
+           NAME="TRUST_ALL_SERVER"
+           FIELD="CHECK"
+           REQUIRED="true"
+           SHOW_IF="PROTO == 'HTTPS_PROTO'"
+           NUM_ROW="70"
+   >
+       <DEFAULT>false</DEFAULT>
+   </PARAMETER>
     </ADVANCED_PARAMETERS>
 
-    <CODEGENERATION>
-        <IMPORTS>
-            <IMPORT NAME="httpclient-4.5.13" MODULE="httpclient-4.5.13.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.13" REQUIRED_IF="(PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')" />
-            <IMPORT NAME="httpcore-4.4.13" MODULE="httpcore-4.4.13.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.13" REQUIRED_IF="(PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')" />
-            <IMPORT NAME="httpmime-4.5.13" MODULE="httpmime-4.5.13.jar" MVN="mvn:org.apache.httpcomponents/httpmime/4.5.13" REQUIRED_IF="(PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')" />
-            <IMPORT NAME="COMMONS-Logging" MODULE="commons-logging-1.1.jar" MVN="mvn:org.talend.libraries/commons-logging-1.1/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-logging-1.1.jar" REQUIRED_IF="(PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')" />
-            <IMPORT NAME="commons-codec-1.14" MODULE="commons-codec-1.14.jar" MVN="mvn:commons-codec/commons-codec/1.14" REQUIRED_IF="(PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')" />
-            <IMPORT NAME="jcifs-samba" MODULE="jcifs-1.3.0.jar" MVN="mvn:org.talend.libraries/jcifs-1.3.0/6.0.0"  REQUIRED_IF="(PROTO == 'SAMBA_PROTO')" />
-        </IMPORTS>
-    </CODEGENERATION>
+  <CODEGENERATION>
+   <IMPORTS>
+       <IMPORT NAME="COMMONS-httpclient" MODULE="commons-httpclient-3.0.1.jar" MVN="mvn:commons-httpclient/commons-httpclient/3.0.1" REQUIRED="true" />
+       <IMPORT NAME="COMMONS-Logging" MODULE="commons-logging-1.1.jar" MVN="mvn:org.talend.libraries/commons-logging-1.1/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-logging-1.1.jar" REQUIRED="true" />
+       <IMPORT NAME="commons-codec-1.14" MODULE="commons-codec-1.14.jar" MVN="mvn:commons-codec/commons-codec/1.14" REQUIRED="true" />
+  	   <IMPORT NAME="jcifs-samba" MODULE="jcifs-1.3.0.jar" MVN="mvn:org.talend.libraries/jcifs-1.3.0/6.0.0"  REQUIRED="true" />
+     </IMPORTS>
+  </CODEGENERATION>
 
-    <RETURNS>
-        <RETURN NAME="INPUT_STREAM" TYPE="java.io.InputStream" AVAILABILITY="FLOW"/>
-    </RETURNS>
+  <RETURNS>
+    <RETURN NAME="INPUT_STREAM" TYPE="java.io.InputStream" AVAILABILITY="FLOW"/>
+  </RETURNS>
 
 </COMPONENT>

main/plugins/org.talend.designer.components.localprovider/components/tFileFetch/tFileFetch_main.javajet

@@ -87,16 +87,15 @@ globalMap.put("<%=cid%>_ERROR_MESSAGE",e.getMessage());
 		}
 %>
 	}
-  final org.apache.http.impl.client.HttpClientBuilder httpClientBuilder_<%=cid%> = org.apache.http.impl.client.HttpClientBuilder.create();
 	<%
 	if ("https".equals(protocol)) {
 	%>
+	
+		class SocketFactory_<%=cid%> implements org.apache.commons.httpclient.protocol.SecureProtocolSocketFactory {
 
-		 class tFileFetchHelper_<%=cid%>  {
+			private javax.net.ssl.SSLContext sslcontext = null;
 
-			private  javax.net.ssl.SSLContext sslcontext = null;
-
-			private  javax.net.ssl.SSLContext createSSLContext() throws java.io.IOException{
+			private javax.net.ssl.SSLContext createSSLContext() throws java.io.IOException{
 				javax.net.ssl.SSLContext sslcontext = null;
 				try {
                     sslcontext = javax.net.ssl.SSLContext.getInstance("SSL");
@@ -112,7 +111,7 @@ globalMap.put("<%=cid%>_ERROR_MESSAGE",e.getMessage());
                             kmf.init(keyStore, keyStorePassword.toCharArray());
                             keyManagers = kmf.getKeyManagers();
                         } catch (java.security.UnrecoverableKeyException|java.security.KeyStoreException|java.security.cert.CertificateException e) {
-                            globalMap.put("<%=cid%>_ERROR_MESSAGE",e.getMessage());
+globalMap.put("<%=cid%>_ERROR_MESSAGE",e.getMessage());
                             <%if(isLog4jEnabled) {%>
                             log.error(e.getLocalizedMessage());
                             <%}%>
@@ -132,7 +131,7 @@ globalMap.put("<%=cid%>_ERROR_MESSAGE",e.getMessage());
                             trustManagers = tmf.getTrustManagers();
 
                         } catch (java.security.KeyStoreException|java.security.cert.CertificateException e) {
-                            globalMap.put("<%=cid%>_ERROR_MESSAGE",e.getMessage());
+globalMap.put("<%=cid%>_ERROR_MESSAGE",e.getMessage());
                             <%if(isLog4jEnabled) {%>
                             log.error(e.getLocalizedMessage());
                             <%}%>
@@ -143,13 +142,13 @@ globalMap.put("<%=cid%>_ERROR_MESSAGE",e.getMessage());
                     }
                     sslcontext.init(keyManagers, trustManagers, new java.security.SecureRandom());
                 } catch (java.security.NoSuchAlgorithmException e) {
-                    globalMap.put("<%=cid%>_ERROR_MESSAGE",e.getMessage());
+globalMap.put("<%=cid%>_ERROR_MESSAGE",e.getMessage());
 					<%if(isLog4jEnabled){%>
 						log.error("<%=cid%> - " + e.getMessage());
 					<%}%>
 					e.printStackTrace();
 				} catch (java.security.KeyManagementException e) {
-                    globalMap.put("<%=cid%>_ERROR_MESSAGE",e.getMessage());
+globalMap.put("<%=cid%>_ERROR_MESSAGE",e.getMessage());
 					<%if(isLog4jEnabled){%>
 						log.error("<%=cid%> - " + e.getMessage());
 					<%}%>
@@ -159,12 +158,47 @@ globalMap.put("<%=cid%>_ERROR_MESSAGE",e.getMessage());
 			}
 
 			private javax.net.ssl.SSLContext getSSLContext() throws java.io.IOException{
+
 				if (this.sslcontext == null) {
 					this.sslcontext = createSSLContext();
 				}
 				return this.sslcontext;
 			}
 
+			public java.net.Socket createSocket(java.net.Socket socket, String host, int port, boolean autoClose)
+				throws java.io.IOException, java.net.UnknownHostException {
+				return getSSLContext().getSocketFactory().createSocket(socket, host, port, autoClose);
+			}
+
+			public java.net.Socket createSocket(String host, int port) throws java.io.IOException, java.net.UnknownHostException {
+				return getSSLContext().getSocketFactory().createSocket(host, port);
+			}
+
+			public java.net.Socket createSocket(String host, int port, java.net.InetAddress clientHost, int clientPort)
+				throws java.io.IOException, java.net.UnknownHostException {
+				return getSSLContext().getSocketFactory().createSocket(host, port, clientHost, clientPort);
+			}
+
+			public java.net.Socket createSocket(String host, int port, java.net.InetAddress localAddress, int localPort, org.apache.commons.httpclient.params.HttpConnectionParams params) 
+				throws java.io.IOException, java.net.UnknownHostException, org.apache.commons.httpclient.ConnectTimeoutException {
+
+				if (params == null) {
+					throw new IllegalArgumentException("Parameters may not be null");
+				}
+				int timeout = params.getConnectionTimeout();
+				javax.net.SocketFactory socketfactory = getSSLContext().getSocketFactory();
+
+				if (timeout == 0) {
+					return socketfactory.createSocket(host, port, localAddress, localPort);
+				} else {
+					java.net.Socket socket = socketfactory.createSocket();
+					java.net.SocketAddress localaddr = new java.net.InetSocketAddress(localAddress, localPort);
+					java.net.SocketAddress remoteaddr = new java.net.InetSocketAddress(host, port);
+					socket.bind(localaddr);
+					socket.connect(remoteaddr, timeout);
+					return socket;
+				}
+			}
 
 			class TrustAnyTrustManager implements javax.net.ssl.X509TrustManager {
 				public void checkClientTrusted(java.security.cert.X509Certificate[] chain, String authType)
@@ -179,37 +213,98 @@ globalMap.put("<%=cid%>_ERROR_MESSAGE",e.getMessage());
 			}
 		}
 
-		org.apache.http.conn.ssl.SSLConnectionSocketFactory sslConSocFactory_<%=cid %> =
-		new org.apache.http.conn.ssl.SSLConnectionSocketFactory(new tFileFetchHelper_<%=cid%>().getSSLContext()
-		, new org.apache.http.conn.ssl.NoopHostnameVerifier());
-		httpClientBuilder_<%=cid %>.setSSLSocketFactory(sslConSocFactory_<%=cid %>);
-
+			org.apache.commons.httpclient.protocol.Protocol myhttps_<%=cid%> = new org.apache.commons.httpclient.protocol.Protocol("https", new SocketFactory_<%=cid%>(), 443);
+			org.apache.commons.httpclient.protocol.Protocol.registerProtocol("https", myhttps_<%=cid%>);
 <%
 	}
 %>
+	org.apache.commons.httpclient.HttpClient client_<%=cid %> = new org.apache.commons.httpclient.HttpClient();
+	<%if(isLog4jEnabled){%>
+		log.info("<%=cid%> - Connection attempt to '" + <%=uri %>);
+	<%}%>
+	client_<%=cid %>.getHttpConnectionManager().getParams().setConnectionTimeout(<%=timeout %>);
+	<%if(isLog4jEnabled){%>
+		log.info("<%=cid%> - Connection to '" +  <%=uri %> + "' has succeeded.");
+	<%}%>
+	client_<%=cid %>.getParams().setCookiePolicy(org.apache.commons.httpclient.cookie.CookiePolicy.<%=cookiePolicy %>);
+	<%if(singleCookie){%>
+	client_<%=cid%>.getParams().setBooleanParameter(org.apache.commons.httpclient.params.HttpMethodParams.SINGLE_COOKIE_HEADER, true);
+	<%}%>
+	<%if (readCookie) {%>
+		List<org.apache.commons.httpclient.Cookie> cookieList_<%=cid%> = null;
+		java.io.FileInputStream fis_<%=cid%> = null;
+		java.io.ObjectInputStream is_<%=cid%> = null;
+		
+		try {
+			cookieList_<%=cid%> = new java.util.ArrayList<org.apache.commons.httpclient.Cookie>();
+			fis_<%=cid%> = new java.io.FileInputStream(new java.io.File(<%=cookieDir%>));
+			is_<%=cid%> = new java.io.ObjectInputStream(fis_<%=cid%>);
+			Object obj_<%=cid%> = is_<%=cid%>.readObject();
 
+			while (obj_<%=cid%> != null) {
+				cookieList_<%=cid%>.add((org.apache.commons.httpclient.Cookie) obj_<%=cid%>);
 
-org.apache.http.client.CredentialsProvider credsProvider_<%=cid %> = new org.apache.http.impl.client.BasicCredentialsProvider();
-<%
-		if (useProxy) {
+				try {
+					obj_<%=cid%> = is_<%=cid%>.readObject();
+				} catch (java.io.IOException e) {
+globalMap.put("<%=cid%>_ERROR_MESSAGE",e.getMessage());
+					<%if(isLog4jEnabled){%>
+						log.warn("<%=cid%> - " + e.getMessage());
+					<%}%>
+					obj_<%=cid%> = null;
+				}
+			}
+		} catch (java.io.FileNotFoundException e1) {
+globalMap.put("<%=cid%>_ERROR_MESSAGE",e1.getMessage());
+			<%if(isLog4jEnabled){%>
+				log.error("<%=cid%> - " + e1.getMessage());
+			<%}%>
+			e1.printStackTrace();
+		} catch (java.io.IOException e) {
+globalMap.put("<%=cid%>_ERROR_MESSAGE",e.getMessage());
+			<%if(isLog4jEnabled){%>
+				log.error("<%=cid%> - " + e.getMessage());
+			<%}%>
+			e.printStackTrace();
+		} catch (java.lang.ClassNotFoundException e) {
+globalMap.put("<%=cid%>_ERROR_MESSAGE",e.getMessage());
+			<%if(isLog4jEnabled){%>
+				log.error("<%=cid%> - " + e.getMessage());
+			<%}%>
+			e.printStackTrace();
+		} finally {
+			if (is_<%=cid%> != null) is_<%=cid%>.close();
+			if (fis_<%=cid%> != null) fis_<%=cid%>.close();
+		}
 
-    		String passwordFieldName = "__PROXY_PASSWORD__";
-    		%>
-    		httpClientBuilder_<%=cid %>.setProxy(new org.apache.http.HttpHost(<%=proxyHost %>, Integer.parseInt(<%=proxyPort%>)));
+		if (cookieList_<%=cid%> != null)
+			client_<%=cid %>.getState().addCookies(cookieList_<%=cid%>.toArray(new org.apache.commons.httpclient.Cookie[0]));
+	<%
+	}
 
-    		<%@ include file="@{org.talend.designer.components.localprovider}/components/templates/password.javajet"%>
-    		
-
-    		<%if (useProxyNTLM) {%>
-    			credsProvider_<%=cid %>.setCredentials(new org.apache.http.auth.AuthScope(<%=proxyHost %>, Integer.parseInt(<%=proxyPort%>)), new
-                                org.apache.http.auth.NTCredentials( <%=proxyUser %>,
-                                                 decryptedPassword_<%=cid%>, <%=proxyHost %>, <%=proxyDomain %> ));
-    		<%} else {%>
-    			credsProvider_<%=cid %>.setCredentials(new org.apache.http.auth.AuthScope(<%=proxyHost %>, Integer.parseInt(<%=proxyPort%>)), new
-                                                org.apache.http.auth.UsernamePasswordCredentials( <%=proxyUser %>,
-                                                                 decryptedPassword_<%=cid%> ));
-    		<%}
-    	}
+	if (useProxy) {%> 
+		client_<%=cid %>.getHostConfiguration().setProxy(<%=proxyHost %>, Integer.parseInt(<%=proxyPort%>));
+	        
+		<%
+		String passwordFieldName = "__PROXY_PASSWORD__";
+		%>
+		
+		<%@ include file="@{org.talend.designer.components.localprovider}/components/templates/password.javajet"%>
+	   	
+		<%if (useProxyNTLM) {%>
+			client_<%=cid %>.getState().setProxyCredentials(
+			new org.apache.commons.httpclient.auth.AuthScope( <%=proxyHost %>, Integer.parseInt(<%=proxyPort%>), null ),
+			new org.apache.commons.httpclient.NTCredentials( <%=proxyUser %>,
+			decryptedPassword_<%=cid%>, <%=proxyHost %>, <%=proxyDomain %> ));
+		<%} else {%>
+			client_<%=cid %>.getState().setProxyCredentials(
+			new org.apache.commons.httpclient.auth.AuthScope(<%=proxyHost %>, Integer.parseInt(<%=proxyPort%>), null),
+			new org.apache.commons.httpclient.UsernamePasswordCredentials(<%=proxyUser %>, decryptedPassword_<%=cid%>));
+			
+			java.util.List<String> authPrefs_<%=cid %> = java.util.Collections.singletonList(org.apache.commons.httpclient.auth.AuthPolicy.BASIC);
+			client_<%=cid %>.getParams().setParameter(org.apache.commons.httpclient.auth.AuthPolicy.AUTH_SCHEME_PRIORITY, authPrefs_<%=cid %>);
+		<%}
+	}
 
 	if (needAuth) {
 		if (ElementParameterParser.canEncrypt(node, "__AUTH_PASSWORD__")) {
@@ -221,111 +316,22 @@ org.apache.http.client.CredentialsProvider credsProvider_<%=cid %> = new org.apa
 		String decryptedPwd_<%=cid%> = <%= ElementParameterParser.getValue(node, "__AUTH_PASSWORD__")%>;
 		<%
 		}
-
+		
 		if ((!useProxy) && useProxyNTLM && (!"".equals(proxyDomain))) {
 		%>
-						   credsProvider_<%=cid %>.setCredentials( org.apache.http.auth.AuthScope.ANY, new
-                                                                        org.apache.http.auth.NTCredentials( <%=username %>, decryptedPwd_<%=cid%>, 
-																		new java.net.URL(<%=uri%>).getHost(), <%=proxyDomain%>));
+			client_<%=cid %>.getState().setCredentials(org.apache.commons.httpclient.auth.AuthScope.ANY, new org.apache.commons.httpclient.NTCredentials(<%=username %>, decryptedPwd_<%=cid%>, new java.net.URL(<%=uri%>).getHost(), <%=proxyDomain%>));
 		<%} else {%>
-			    			credsProvider_<%=cid %>.setCredentials( org.apache.http.auth.AuthScope.ANY, new
-                                                            org.apache.http.auth.UsernamePasswordCredentials( <%=username %>, decryptedPwd_<%=cid%>));
-		<%}%>
-		
-		<%
+			client_<%=cid %>.getState().setCredentials(org.apache.commons.httpclient.auth.AuthScope.ANY, new org.apache.commons.httpclient.UsernamePasswordCredentials(<%=username %>, decryptedPwd_<%=cid%>));
+		<%}
 	}
 
-    	%>
-		httpClientBuilder_<%=cid %>.setDefaultCredentialsProvider(credsProvider_<%=cid %>);
-
-     org.apache.http.impl.client.CloseableHttpClient client_<%=cid %> = httpClientBuilder_<%=cid%>.build();
-	<%if(isLog4jEnabled){%>
-		log.info("<%=cid%> - Connection attempt to '" + <%=uri %>);
-	<%}%>
-	final org.apache.http.client.config.RequestConfig.Builder builder_<%=cid%> = org.apache.http.client.config.RequestConfig.custom();
-	builder_<%=cid%>.setConnectTimeout(<%=timeout %>);
-	<%if(isLog4jEnabled){%>
-		log.info("<%=cid%> - Connection to '" +  <%=uri %> + "' has succeeded.");
-	<%
-	}
-	%>
-        org.apache.http.conn.util.PublicSuffixMatcher publicSuffixMatcher_<%=cid%> = org.apache.http.conn.util.PublicSuffixMatcherLoader.getDefault();
-        org.apache.http.config.Registry<org.apache.http.cookie.CookieSpecProvider> cookieSpecReg_<%=cid%> = org.apache.http.config.RegistryBuilder.<org.apache.http.cookie.CookieSpecProvider>create()
-                .register(org.apache.http.client.config.CookieSpecs.DEFAULT, new org.apache.http.impl.cookie.DefaultCookieSpecProvider(org.apache.http.impl.cookie.DefaultCookieSpecProvider.CompatibilityLevel.DEFAULT, publicSuffixMatcher_<%=cid%>, null, <%=singleCookie%>))
-                .register(org.apache.http.client.config.CookieSpecs.STANDARD, new org.apache.http.impl.cookie.RFC6265CookieSpecProvider(publicSuffixMatcher_<%=cid%>)).build();
-         org.apache.http.client.CookieStore cookieStore_<%=cid%> = new org.apache.http.impl.client.BasicCookieStore();
-
-        final org.apache.http.client.protocol.HttpClientContext context_<%=cid%> = org.apache.http.client.protocol.HttpClientContext.create();
-        context_<%=cid%>.setCookieSpecRegistry(cookieSpecReg_<%=cid%>);
-        context_<%=cid%>.setCookieStore(cookieStore_<%=cid%>);
-
-
-	<%if (readCookie) {%>
-		List<org.apache.http.cookie.Cookie> cookieList_<%=cid%> = null;
-		java.io.FileInputStream fis_<%=cid%> = null;
-		java.io.ObjectInputStream is_<%=cid%> = null;
-		
-		try {
-			cookieList_<%=cid%> = new java.util.ArrayList<org.apache.http.cookie.Cookie>();
-			fis_<%=cid%> = new java.io.FileInputStream(new java.io.File(<%=cookieDir%>));
-			is_<%=cid%> = new java.io.ObjectInputStream(fis_<%=cid%>);
-		    Object obj_<%=cid%> = null;
-		try{
-		        obj_<%=cid%> = is_<%=cid%>.readObject();
-		}catch (java.io.EOFException e){
-             <%if(isLog4jEnabled){%>
-		        log.warn("<%=cid%> - cookie file {} {}",<%=cookieDir%>," is empty." );
-             <%}%>
-		    }
-			while (obj_<%=cid%> != null) {
-				cookieList_<%=cid%>.add((org.apache.http.cookie.Cookie) obj_<%=cid%>);
-
-				try {
-					obj_<%=cid%> = is_<%=cid%>.readObject();
-				} catch (java.io.IOException e) {
-                    globalMap.put("<%=cid%>_ERROR_MESSAGE",e.getMessage());
-					<%if(isLog4jEnabled){%>
-						log.warn("<%=cid%> - " + e.getMessage());
-					<%}%>
-					obj_<%=cid%> = null;
-				}
-			}
-		} catch (java.io.IOException e1) {
-            globalMap.put("<%=cid%>_ERROR_MESSAGE",e1.getMessage());
-			<%if(isLog4jEnabled){%>
-				log.error("<%=cid%> - " + e1.getMessage());
-			<%}%>
-			e1.printStackTrace();
-		} catch (java.lang.ClassNotFoundException e) {
-            globalMap.put("<%=cid%>_ERROR_MESSAGE",e.getMessage());
-			<%if(isLog4jEnabled){%>
-		        log.error("<%=cid%> - " + "Existing cookie is not compatible with library, please check the \"Save cookie\" option to regenerate.");
-			<%}else{%>
-		        System.err.println("Existing cookie is not compatible with library, please check the \"Save cookie\" option to regenerate.");
-		    <%}%>
-		} finally {
-			if (is_<%=cid%> != null) is_<%=cid%>.close();
-			if (fis_<%=cid%> != null) fis_<%=cid%>.close();
-		}
-
-		if (cookieList_<%=cid%> != null)
-			cookieList_<%=cid%>.forEach(cookieStore_<%=cid%>::addCookie);
-	<%
-	}
-
-
 	if (post) {
 	%>
-		org.apache.http.client.methods.HttpPost method_<%=cid%> = new org.apache.http.client.methods.HttpPost(uriToFetch_<%=cid %><% if (encodeURI) { %>.toASCIIString()<% } else {%>.toString() <% } %>);
-		List<org.apache.http.NameValuePair> nameValuePairList_<%=cid%> = new java.util.ArrayList<>();
+		org.apache.commons.httpclient.HttpMethod method_<%=cid%> = new org.apache.commons.httpclient.methods.PostMethod(uriToFetch_<%=cid %><% if (encodeURI) { %>.toASCIIString()<% } else {%>.toString() <% } %>);
 		<%
 		List<Map<String, String>> commonParams = (List<Map<String,String>>)ElementParameterParser.getObjectValue(node, "__COMMON_PARAMS__");	
 		List<String> varPartList = new ArrayList<String>();	//common string parameter part	
 		int i = 0;
-		%>
-		org.apache.http.entity.mime.MultipartEntityBuilder entityBuilder_<%=cid%> = org.apache.http.entity.mime.MultipartEntityBuilder.create();
-		<%
-
 
 		for (Map<String, String> param : commonParams) {
 			i++;
@@ -333,7 +339,7 @@ org.apache.http.client.CredentialsProvider credsProvider_<%=cid %> = new org.apa
 			String value = param.get("COMMON_PARAMS_VALUE");
 			varPartList.add("common_" + i + "_" + cid);
 			%>
-		    entityBuilder_<%=cid%>.addTextBody(<%=name %>, <%=value %>);
+			org.apache.commons.httpclient.methods.multipart.StringPart common_<%=i%>_<%=cid%> = new org.apache.commons.httpclient.methods.multipart.StringPart(<%=name %>, <%=value %>, <%=paramsCharset %>);
 			<%
 		}
 
@@ -349,20 +355,15 @@ org.apache.http.client.CredentialsProvider credsProvider_<%=cid %> = new org.apa
 				String charset = param.get("FILE_PARAMS_CHARSET");
 				varPartList.add("file_" + j + "_" + cid);
 				%>
-
-                entityBuilder_<%=cid%>.setCharset(java.nio.charset.Charset.forName(<%=charset%>));
-                entityBuilder_<%=cid%>.addBinaryBody(<%=name%>,new java.io.File(<%=value %>),
-                org.apache.http.entity.ContentType.parse(<%=content_type%>),new java.io.File(<%=value %>).getName());
-
-
+				org.apache.commons.httpclient.methods.multipart.FilePart file_<%=j%>_<%=cid%>  = new org.apache.commons.httpclient.methods.multipart.FilePart(<%=name %>, new java.io.File(<%=value %>), <%=content_type%>, <%=charset%>);
 			<%
 			}
 		}
 		%>
-		method_<%=cid%>.setEntity(entityBuilder_<%=cid%>.build());
-
+		org.apache.commons.httpclient.methods.multipart.Part[] parts_<%=cid %> = new org.apache.commons.httpclient.methods.multipart.Part[]{<%for(String var: varPartList){%><%=var %>,<%}%>};    
+		((org.apache.commons.httpclient.methods.PostMethod)method_<%=cid%>).setRequestEntity(new org.apache.commons.httpclient.methods.multipart.MultipartRequestEntity(parts_<%=cid %>, method_<%=cid%>.getParams()));
 	<%} else {%>
-		org.apache.http.client.methods.HttpGet method_<%=cid%> = new org.apache.http.client.methods.HttpGet(uriToFetch_<%=cid %><% if (encodeURI) { %>.toASCIIString()<% } else {%>.toString() <% } %>);
+		org.apache.commons.httpclient.HttpMethod method_<%=cid%> = new org.apache.commons.httpclient.methods.GetMethod(uriToFetch_<%=cid %><% if (encodeURI) { %>.toASCIIString()<% } else {%>.toString() <% } %>);
 	<%}
 
 	if (addHeader) {
@@ -370,68 +371,63 @@ org.apache.http.client.CredentialsProvider credsProvider_<%=cid %> = new org.apa
 		
 		for (Map<String, String> header : headers) {
 		%>
-			method_<%=cid%>.setHeader(<%=header.get("HEADER_NAME")%>,<%=header.get("HEADER_VALUE")%>);
+			method_<%=cid%>.addRequestHeader(<%=header.get("HEADER_NAME")%>,<%=header.get("HEADER_VALUE")%>);
 		<%
 		}
 	}
 	%>
 	boolean isContinue_<%=cid%> = true;
 	int status_<%=cid%>;
-	org.apache.http.client.methods.CloseableHttpResponse httpResponse_<%=cid%> = null;
 	String finalURL_<%=cid%> = uriToFetch_<%=cid %><% if (encodeURI) { %>.toASCIIString()<% } else {%>.toString() <% } %>;
 
 	try { // B_01
 		<%if (redirect) { //Bug13155, add support of redirection%>
 			boolean redirect_<%=cid%> = true;
-			 org.apache.http.client.methods.HttpRequestBase request_<%=cid%> = method_<%=cid%>;
 
 			while (redirect_<%=cid%>) {
+				status_<%=cid%> = client_<%=cid %>.executeMethod(method_<%=cid%>);
 
-				httpResponse_<%=cid%> = client_<%=cid %>.execute( request_<%=cid%> ,context_<%=cid%>);
-				status_<%=cid%> = httpResponse_<%=cid%>.getStatusLine().getStatusCode();
-
-				if ((status_<%=cid%> == org.apache.http.HttpStatus.SC_MOVED_TEMPORARILY)
-					|| (status_<%=cid%> == org.apache.http.HttpStatus.SC_MOVED_PERMANENTLY)
-						|| (status_<%=cid%> == org.apache.http.HttpStatus.SC_SEE_OTHER)
-							|| (status_<%=cid%> == org.apache.http.HttpStatus.SC_TEMPORARY_REDIRECT)) {
+				if ((status_<%=cid%> == org.apache.commons.httpclient.HttpStatus.SC_MOVED_TEMPORARILY) 
+					|| (status_<%=cid%> == org.apache.commons.httpclient.HttpStatus.SC_MOVED_PERMANENTLY)
+						|| (status_<%=cid%> == org.apache.commons.httpclient.HttpStatus.SC_SEE_OTHER) 
+							|| (status_<%=cid%> == org.apache.commons.httpclient.HttpStatus.SC_TEMPORARY_REDIRECT)) {
 					<%if(isLog4jEnabled){%>
 						log.info("<%=cid%> - Closing the connection to the server.");
 					<%}%>
-					request_<%=cid%>.releaseConnection();
+					method_<%=cid%>.releaseConnection();
 					<%if(isLog4jEnabled){%>
 						log.info("<%=cid%> - Connection to the server closed.");
 					<%}%>
 
-					String redirect_url_<%=cid%> = httpResponse_<%=cid%>.getFirstHeader("location").getValue();
+					String redirect_url_<%=cid%> = method_<%=cid%>.getResponseHeader("location").getValue();
                     if(!redirect_url_<%=cid%>.startsWith("http")){
-                        redirect_url_<%=cid%> = request_<%=cid%>.getURI().getScheme()+"://" + request_<%=cid%>.getURI().getHost() + ":" + request_<%=cid%>.getURI().getPort() + redirect_url_<%=cid%>;
+                        redirect_url_<%=cid%> = method_<%=cid%>.getHostConfiguration().getProtocol().getScheme()+"://" + method_<%=cid%>.getURI().getHost() + ":" + method_<%=cid%>.getURI().getPort() + redirect_url_<%=cid%>;
                     }
 
-                    if(status_<%=cid%> == org.apache.http.HttpStatus.SC_SEE_OTHER<% if(redirect_302_as_303) {%> || status_<%=cid%> == org.apache.http.HttpStatus.SC_MOVED_TEMPORARILY<% } %>) {
-                        request_<%=cid%> = new org.apache.http.client.methods.HttpGet(redirect_url_<%=cid%>);
+                    if(status_<%=cid%> == org.apache.commons.httpclient.HttpStatus.SC_SEE_OTHER<% if(redirect_302_as_303) {%> || status_<%=cid%> == org.apache.commons.httpclient.HttpStatus.SC_MOVED_TEMPORARILY<% } %>) {
+                        method_<%=cid%> = new org.apache.commons.httpclient.methods.GetMethod(redirect_url_<%=cid%>);
                     }
                     else{
-                        request_<%=cid%> =new org.apache.http.client.methods.Http<%if(post){%>Post<%}else{%>Get<%}%>(redirect_url_<%=cid%>);
+                        method_<%=cid%> = new org.apache.commons.httpclient.methods.<%if(post){%>Post<%}else{%>Get<%}%>Method(redirect_url_<%=cid%>);
                     }
 
-					System.out.println("Redirect to: " + request_<%=cid%>.getURI());
-					finalURL_<%=cid%> = request_<%=cid%>.getURI().toString();
+					System.out.println("Redirect to: " + method_<%=cid%>.getURI());
+					finalURL_<%=cid%> = method_<%=cid%>.getURI().toString();
 				} else if (status_<%=cid%> >= 200 && status_<%=cid%> < 300) { //Status code 2XX indicates success
 					redirect_<%=cid%> = false;
 				} else {
-					throw new java.lang.Exception("Method failed: " + httpResponse_<%=cid%>.getStatusLine());
+					throw new java.lang.Exception("Method failed: " + method_<%=cid%>.getStatusLine());
 				}
 			}
 		<%} else {%>
-			httpResponse_<%=cid%> = client_<%=cid %>.execute(method_<%=cid%>,context_<%=cid%>);
-            status_<%=cid%> = httpResponse_<%=cid%>.getStatusLine().getStatusCode();
+			status_<%=cid%>  = client_<%=cid %>.executeMethod(method_<%=cid%>);
 		<%
 		}
 
 		if (!redirect) {
 		%>
 			if (!(status_<%=cid%> >= 200 && status_<%=cid%> < 300)){//Status code 2XX indicates success
-				throw new java.lang.Exception("Method failed: " + httpResponse_<%=cid%>.getStatusLine());
+				throw new java.lang.Exception("Method failed: " + method_<%=cid%>.getStatusLine());
 			}
 		<%
 		}
@@ -452,7 +448,7 @@ globalMap.put("<%=cid%>_ERROR_MESSAGE",e.getMessage());
 	}
     <% if(saveCookie){ %>
 	finally {
-        List<org.apache.http.cookie.Cookie> cookies_<%=cid%> = context_<%=cid%>.getCookieStore().getCookies();
+        org.apache.commons.httpclient.Cookie[] cookies_<%=cid%> = client_<%=cid %>.getState().getCookies();
         java.io.File cookieFile_<%=cid%> = new java.io.File(<%=cookieDir%>);
         java.io.File cookieDir_<%=cid%>= cookieFile_<%=cid%>.getParentFile();
         if(!cookieDir_<%=cid%>.exists()){
@@ -461,7 +457,7 @@ globalMap.put("<%=cid%>_ERROR_MESSAGE",e.getMessage());
         java.io.FileOutputStream fos_<%=cid%> = new java.io.FileOutputStream(cookieFile_<%=cid%>);
         java.io.ObjectOutputStream os_<%=cid%> = new java.io.ObjectOutputStream(fos_<%=cid%>);
 
-        for (org.apache.http.cookie.Cookie c : cookies_<%=cid%>) {
+        for (org.apache.commons.httpclient.Cookie c : cookies_<%=cid%>) {
             os_<%=cid%>.writeObject(c);
         }
         os_<%=cid%>.close();
@@ -471,20 +467,20 @@ globalMap.put("<%=cid%>_ERROR_MESSAGE",e.getMessage());
 
 	if (isContinue_<%=cid%>) {    
 		<%if (printResponse) {%>
-			System.out.println("Status Line: " + httpResponse_<%=cid%>.getStatusLine());  
+			System.out.println("Status Line: " + method_<%=cid%>.getStatusLine());  
 			System.out.println("*** Response Header ***");  
-			org.apache.http.Header[] responseHeaders_<%=cid %> = httpResponse_<%=cid%>.getAllHeaders();
+			org.apache.commons.httpclient.Header[] responseHeaders_<%=cid %> = method_<%=cid%>.getResponseHeaders();  
 
 			for (int i = 0; i < responseHeaders_<%=cid %>.length; i++) {
-				System.out.println(responseHeaders_<%=cid %>[i]);
+				System.out.print(responseHeaders_<%=cid %>[i]);
 			}
 		<%
 		}
 
 		if (bUseCache) {%>
-			retIS_<%=cid%> = httpResponse_<%=cid%>.getEntity().getContent();
+			retIS_<%=cid%> = method_<%=cid%>.getResponseBodyAsStream();
 		<%} else {%>
-			java.io.InputStream in_<%=cid %> = httpResponse_<%=cid%>.getEntity().getContent();
+			java.io.InputStream in_<%=cid %> = method_<%=cid%>.getResponseBodyAsStream();
 			String sDir_<%=cid%> = (<%=directory%>).trim();
 			String fileName_<%=cid %> = (<%=filename%>).trim();    
 			//open directory