feat(TDQ-19814): clear the code let it call adjustPomGeneration only to (#7132)

avoid some TDM regression

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

@@ -9,4 +9,4 @@
   </parent>
   <artifactId>org.talend.gmf.feature</artifactId>
   <packaging>eclipse-feature</packaging>
-</project>
+</project>

main/features/org.talend.studio.components.tcompv0.azurestorage.feature/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.talend.studio</groupId>
-    <artifactId>tdi-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.studio.components.tcompv0.azurestorage.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.talend.studio</groupId>
+    <artifactId>tdi-studio-se</artifactId>
+    <version>8.0.1-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.studio.components.tcompv0.azurestorage.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

main/features/org.talend.studio.components.tcompv0.googledrive.feature/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.talend.studio</groupId>
-    <artifactId>tdi-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.studio.components.tcompv0.googledrive.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.talend.studio</groupId>
+    <artifactId>tdi-studio-se</artifactId>
+    <version>8.0.1-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.studio.components.tcompv0.googledrive.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

main/features/org.talend.studio.components.tcompv0.jira.feature/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.talend.studio</groupId>
-    <artifactId>tdi-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.studio.components.tcompv0.jira.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.talend.studio</groupId>
+    <artifactId>tdi-studio-se</artifactId>
+    <version>8.0.1-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.studio.components.tcompv0.jira.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

main/features/org.talend.studio.components.tcompv0.marketo.feature/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.talend.studio</groupId>
-    <artifactId>tdi-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.studio.components.tcompv0.marketo.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.talend.studio</groupId>
+    <artifactId>tdi-studio-se</artifactId>
+    <version>8.0.1-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.studio.components.tcompv0.marketo.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

main/features/org.talend.studio.components.tcompv0.marklogic.feature/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.talend.studio</groupId>
-    <artifactId>tdi-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.studio.components.tcompv0.marklogic.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.talend.studio</groupId>
+    <artifactId>tdi-studio-se</artifactId>
+    <version>8.0.1-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.studio.components.tcompv0.marklogic.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

main/features/org.talend.studio.components.tcompv0.netsuite.feature/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.talend.studio</groupId>
-    <artifactId>tdi-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.studio.components.tcompv0.netsuite.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.talend.studio</groupId>
+    <artifactId>tdi-studio-se</artifactId>
+    <version>8.0.1-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.studio.components.tcompv0.netsuite.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

main/features/org.talend.studio.components.tcompv0.salesforce.feature/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.talend.studio</groupId>
-    <artifactId>tdi-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.studio.components.tcompv0.salesforce.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.talend.studio</groupId>
+    <artifactId>tdi-studio-se</artifactId>
+    <version>8.0.1-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.studio.components.tcompv0.salesforce.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

main/features/org.talend.studio.components.tcompv0.snowflake.feature/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.talend.studio</groupId>
-    <artifactId>tdi-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.studio.components.tcompv0.snowflake.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.talend.studio</groupId>
+    <artifactId>tdi-studio-se</artifactId>
+    <version>8.0.1-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.studio.components.tcompv0.snowflake.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

main/features/org.talend.studio.components.tcompv0.splunk.feature/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.talend.studio</groupId>
-    <artifactId>tdi-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.studio.components.tcompv0.splunk.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.talend.studio</groupId>
+    <artifactId>tdi-studio-se</artifactId>
+    <version>8.0.1-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.studio.components.tcompv0.splunk.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

main/features/org.talend.tos.libraries.feature/feature.xml

@@ -43,7 +43,6 @@
   <plugin id="org.talend.libraries.palo" download-size="0" install-size="0" version="0.0.0"/>
   <plugin id="org.talend.libraries.persist.lookup" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
   <plugin id="org.talend.libraries.salesforce" download-size="0" install-size="0" version="0.0.0"/>
-  <plugin id="org.talend.libraries.servlet" download-size="0" install-size="0" version="0.0.0"/>
   <plugin id="org.talend.libraries.slf4j" download-size="0" install-size="0" version="0.0.0"/>
   <plugin id="org.talend.libraries.xml" download-size="0" install-size="0" version="0.0.0"/>
   <plugin id="org.talend.libraries.zmq" download-size="0" install-size="0" version="0.0.0"/>

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

@@ -3,18 +3,18 @@ prefs.configuration.LINK_STYLE=\u30C7\u30D5\u30A9\u30EB\u30C8\u30DE\u30C3\u30D4\
 prefs.configuration.LINK_STYLE.AUTO=\u81EA\u52D5
 prefs.configuration.LINK_STYLE.BEZIER_CURVE=\u66F2\u7DDA
 prefs.configuration.LINK_STYLE.LINE=\u76F4\u7DDA\uFF08\u9AD8\u901F\uFF09
-DraggingInfosPopup.draggingEntry={0}\u30A8\u30F3\u30C8\u30EA\u3092\u30C9\u30E9\u30C3\u30B0\u3057\u3066\u3044\u307E\u3059\u3002
+DraggingInfosPopup.draggingEntry={0}\u30A8\u30F3\u30C8\u30EA\u30FC\u3092\u30C9\u30E9\u30C3\u30B0\u3057\u3066\u3044\u307E\u3059\u3002
 DraggingInfosPopup.dropInvalid=\n<< \u7121\u52B9\u306A\u30C9\u30ED\u30C3\u30D7 >>\n
-DraggingInfosPopup.draggingEntries={0}\u30A8\u30F3\u30C8\u30EA\u3092\u30C9\u30E9\u30C3\u30B0\u3057\u3066\u3044\u307E\u3059\u3002
+DraggingInfosPopup.draggingEntries={0}\u30A8\u30F3\u30C8\u30EA\u30FC\u3092\u30C9\u30E9\u30C3\u30B0\u3057\u3066\u3044\u307E\u3059\u3002
 DraggingInfosPopup.dropInvalidWithKey=\n<< \u7121\u52B9\u306A\u30C9\u30ED\u30C3\u30D7 >>\n\u4E00\u5BFE\u4E00\u30DE\u30C3\u30D4\u30F3\u30B0\u3057\u3001\u4E0A\u66F8\u304D\u3059\u308B\u5834\u5408\u306F\u3001Shift\u30AD\u30FC\u3068Ctrl\u30AD\u30FC\u3092\u540C\u6642\u306B\u62BC\u3057\u307E\u3059
 DraggingInfosPopup.overwriteMode= > \u4E0A\u66F8\u304D\u30E2\u30FC\u30C9
 DraggingInfosPopup.appendMode= > \u8FFD\u52A0\u30E2\u30FC\u30C9
 DraggingInfosPopup.appendModeToOverwrite= > \u8FFD\u52A0\u30E2\u30FC\u30C9(\u4E0A\u66F8\u304D\u3059\u308B\u306B\u306F[Ctrl]\u30AD\u30FC)
-DraggingInfosPopup.insertAllSelectedEntries= > \u9078\u629E\u3057\u305F\u3059\u3079\u3066\u306E\u30A8\u30F3\u30C8\u30EA\u3092\u633F\u5165\u3057\u307E\u3059
-DraggingInfosPopup.insertRemainingEntries= > \u6B8B\u308A\u306E\u30A8\u30F3\u30C8\u30EA\u3092\u633F\u5165\u3057\u307E\u3059
-DraggingInfosPopup.eachSourceEntryExpressionToEachTargetExpression=> \u5404\u30BF\u30FC\u30B2\u30C3\u30C8\u5F0F\u306B\u5BFE\u3059\u308B\u5404\u30BD\u30FC\u30B9\u30A8\u30F3\u30C8\u30EA\u5F0F
-DraggingInfosPopup.eachSourceEntryToEachTargetExpression=> \u5404\u30BF\u30FC\u30B2\u30C3\u30C8\u5F0F\u306B\u5BFE\u3059\u308B\u5404\u30BD\u30FC\u30B9\u30A8\u30F3\u30C8\u30EA
-DraggingInfosPopup.allSourceEntriesExpressionToASingleOneTargetExpressionShiftKey=> 1\u3064\u306E\u30BF\u30FC\u30B2\u30C3\u30C8\u5F0F\u306B\u5BFE\u3059\u308B\u3059\u3079\u3066\u306E\u30BD\u30FC\u30B9\u30A8\u30F3\u30C8\u30EA\u5F0F (\u30DE\u30C3\u30D4\u30F3\u30B0\u3092\u5909\u66F4\u3059\u308B\u306B\u306FShift\u30AD\u30FC)
-DraggingInfosPopup.allSourceEntriesExpressionToASingleOneTargetExpression=> 1\u3064\u306E\u30BF\u30FC\u30B2\u30C3\u30C8\u5F0F\u306B\u5BFE\u3059\u308B\u3059\u3079\u3066\u306E\u30BD\u30FC\u30B9\u30A8\u30F3\u30C8\u30EA\u5F0F
-DraggingInfosPopup.allSourceEntriesToASingleOneTargetExpressionShiftKey=> 1\u3064\u306E\u30BF\u30FC\u30B2\u30C3\u30C8\u5F0F\u306B\u5BFE\u3059\u308B\u3059\u3079\u3066\u306E\u30BD\u30FC\u30B9\u30A8\u30F3\u30C8\u30EA (\u30DE\u30C3\u30D4\u30F3\u30B0\u3092\u5909\u66F4\u3059\u308B\u306B\u306FShift\u30AD\u30FC)
-DraggingInfosPopup.allSourceEntriesToASingleOneTargetExpression=> 1\u3064\u306E\u30BF\u30FC\u30B2\u30C3\u30C8\u5F0F\u306B\u5BFE\u3059\u308B\u3059\u3079\u3066\u306E\u30BD\u30FC\u30B9\u30A8\u30F3\u30C8\u30EA
+DraggingInfosPopup.insertAllSelectedEntries= > \u9078\u629E\u3057\u305F\u3059\u3079\u3066\u306E\u30A8\u30F3\u30C8\u30EA\u30FC\u3092\u633F\u5165\u3057\u307E\u3059
+DraggingInfosPopup.insertRemainingEntries= > \u6B8B\u308A\u306E\u30A8\u30F3\u30C8\u30EA\u30FC\u3092\u633F\u5165\u3057\u307E\u3059
+DraggingInfosPopup.eachSourceEntryExpressionToEachTargetExpression=> \u5404\u30BF\u30FC\u30B2\u30C3\u30C8\u5F0F\u306B\u5BFE\u3059\u308B\u5404\u30BD\u30FC\u30B9\u30A8\u30F3\u30C8\u30EA\u30FC\u5F0F
+DraggingInfosPopup.eachSourceEntryToEachTargetExpression=> \u5404\u30BF\u30FC\u30B2\u30C3\u30C8\u5F0F\u306B\u5BFE\u3059\u308B\u5404\u30BD\u30FC\u30B9\u30A8\u30F3\u30C8\u30EA\u30FC
+DraggingInfosPopup.allSourceEntriesExpressionToASingleOneTargetExpressionShiftKey=> 1\u3064\u306E\u30BF\u30FC\u30B2\u30C3\u30C8\u5F0F\u306B\u5BFE\u3059\u308B\u3059\u3079\u3066\u306E\u30BD\u30FC\u30B9\u30A8\u30F3\u30C8\u30EA\u30FC\u5F0F (\u30DE\u30C3\u30D4\u30F3\u30B0\u3092\u5909\u66F4\u3059\u308B\u306B\u306FShift\u30AD\u30FC)
+DraggingInfosPopup.allSourceEntriesExpressionToASingleOneTargetExpression=> 1\u3064\u306E\u30BF\u30FC\u30B2\u30C3\u30C8\u5F0F\u306B\u5BFE\u3059\u308B\u3059\u3079\u3066\u306E\u30BD\u30FC\u30B9\u30A8\u30F3\u30C8\u30EA\u30FC\u5F0F
+DraggingInfosPopup.allSourceEntriesToASingleOneTargetExpressionShiftKey=> 1\u3064\u306E\u30BF\u30FC\u30B2\u30C3\u30C8\u5F0F\u306B\u5BFE\u3059\u308B\u3059\u3079\u3066\u306E\u30BD\u30FC\u30B9\u30A8\u30F3\u30C8\u30EA\u30FC (\u30DE\u30C3\u30D4\u30F3\u30B0\u3092\u5909\u66F4\u3059\u308B\u306B\u306FShift\u30AD\u30FC)
+DraggingInfosPopup.allSourceEntriesToASingleOneTargetExpression=> 1\u3064\u306E\u30BF\u30FC\u30B2\u30C3\u30C8\u5F0F\u306B\u5BFE\u3059\u308B\u3059\u3079\u3066\u306E\u30BD\u30FC\u30B9\u30A8\u30F3\u30C8\u30EA\u30FC

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

@@ -4,7 +4,7 @@ AlfrescoOutputManager.schemaError.msg=\u6700\u521D\u306B\u30B9\u30AD\u30FC\u30DE
 AlfrescoOutputModelManager.alreadyAdded=\u3053\u306E\u30E2\u30C7\u30EB\u306F\u65E2\u306B\u8FFD\u52A0\u6E08\u307F\u3067\u3059\u3002
 AlfrescoOutputModelManager.errorReadingModel=Alfresco\u30E2\u30C7\u30EB\u30D5\u30A1\u30A4\u30EB\u306E\u8AAD\u8FBC\u307F\u30A8\u30E9\u30FC
 AlfrescoOutputModelManager.notYetAdded=\u3053\u306E\u30E2\u30C7\u30EB\u306F\u307E\u3060\u8FFD\u52A0\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-AlfrescoOutputModelManager.prefixConflict=\u5148\u306B\u8FFD\u52A0\u3055\u308C\u305F\u30E2\u30C7\u30EB\u306E\u30D7\u30EC\u30D5\u30A3\u30C3\u30AF\u30B9\u306E\u885D\u7A81\u306E\u305F\u3081\u3001\u30E2\u30C7\u30EB\u306E\u8FFD\u52A0\u304C\u51FA\u6765\u307E\u305B\u3093\u3002
+AlfrescoOutputModelManager.prefixConflict=\u5148\u306B\u8FFD\u52A0\u3055\u308C\u305F\u30E2\u30C7\u30EB\u306E\u30D7\u30EC\u30D5\u30A3\u30C3\u30AF\u30B9\u306E\u885D\u7A81\u306E\u305F\u3081\u3001\u30E2\u30C7\u30EB\u306E\u8FFD\u52A0\u304C\u3067\u304D\u307E\u305B\u3093\u3002
 AlfrescoModelDialog.type=\u30BF\u30A4\u30D7
 AlfrescoModelDialog.aspects=\u30A2\u30B9\u30DA\u30AF\u30C8
 AlfrescoModelDialog.availableAspects=\u53EF\u80FD\u306A\u30A2\u30B9\u30DA\u30AF\u30C8

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

@@ -48,7 +48,7 @@ ComponentsFactory.componentNotFound=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u
 ComponentsFactory.load.components=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u3092\u30ED\u30FC\u30C9...
 ComponentsFactory.parentNotRecompiled=\u8B66\u544A: *.inc.javajet\u306E\u89AA\u306F\u518D\u30B3\u30F3\u30D1\u30A4\u30EB\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
 ComponentsFactory.loadComponents.missingFolder=\u30D7\u30E9\u30B0\u30A4\u30F3"{1}"\u306B\u30D5\u30A9\u30EB\u30C0\u30FC"{0}"\u304C\u3042\u308A\u307E\u305B\u3093\u3002
-ComponentsFactory.init.waitForFinish.timeout=ComponentsFactory\u3092\u521D\u671F\u5316\u3067\u304D\u307E\u305B\u3093\u3002\u3082\u3046\u4E00\u5EA6\u8A66\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+ComponentsFactory.init.waitForFinish.timeout=ComponentsFactory\u3092\u521D\u671F\u5316\u3067\u304D\u307E\u305B\u3093\u3002\u3084\u308A\u76F4\u3057\u3066\u307F\u3066\u304F\u3060\u3055\u3044\u3002
 ComponentsLocalProviderService.componentLoadError=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u30ED\u30FC\u30C9\u30A8\u30E9\u30FC
 ComponentsLocalProviderService.talendExchangeError=Talend Exchange \u30A8\u30E9\u30FC
 ComponentsPreferencePage.ButtonLabel0=OK

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

@@ -56,7 +56,7 @@ ShowInstalledExtensionsJob.ShowInstalledExtensions.Title=extensions\u3092\u30A4\
 ShowInstalledExtensionsJob.ShowInstalledExtensions.Message=exchange\u304B\u3089extensions\u3092\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u2026
 DeleteExtensionJob.DeleteExtensionJob.Title=Extension\u3092\u524A\u9664\u3057\u307E\u3059\u2026
 DeleteExtensionJob.DeleteExtensionJob.Message=Extension\u3092\u524A\u9664\u3057\u307E\u3059\u2026
-DeleteExtensionJob.DeleteFailure=\u524A\u9664\u51FA\u6765\u307E\u305B\u3093
+DeleteExtensionJob.DeleteFailure=\u524A\u9664\u3067\u304D\u307E\u305B\u3093
 DeleteExtensionJob.DeleteFailureTip=\u30C1\u30A7\u30C3\u30AF\u3092\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 ModifyExtensionJob.Title=Extension\u3092\u4FEE\u6B63\u2026
 ModifyExtensionJob.Message=Extension\u3092\u4FEE\u6B63\u2026

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

@@ -69,13 +69,13 @@
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-api</artifactId>
-			<version>2.13.2</version>
+			<version>2.17.1</version>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-core</artifactId>
-			<version>2.13.2</version>
+			<version>2.17.1</version>
 			<optional>true</optional>
 		</dependency>
 	</dependencies>
@@ -97,4 +97,4 @@
 		</pluginManagement>
 	</build>
 
-</project>
+</project>

main/plugins/org.talend.designer.components.localprovider/components/tAS400Connection/tAS400Connection_java.xml

@@ -47,8 +47,6 @@
     <PARAMETER NAME="DB_VERSION" FIELD="CLOSED_LIST" NUM_ROW="2"
 			REPOSITORY_VALUE="DB_VERSION">
 			<ITEMS DEFAULT="V7R1_V7R3">
-				<ITEM NAME="V5R2_V5R4" VALUE="jt400_V5R2.jar"/>
-				<ITEM NAME="V5R3_V6R1" VALUE="jt400_V5R3.jar" />
                 <ITEM NAME="V6R1_V7R2" VALUE="jt400_V6R1.jar" />
                 <ITEM NAME="V7R1_V7R3" VALUE="jt400-9.8.jar" />
 			</ITEMS>
@@ -145,12 +143,10 @@
 
    <CODEGENERATION>
      <IMPORTS>
-       <IMPORT NAME="Driver-V5R2_V5R4" MODULE="jt400_V5R2.jar" MVN="mvn:org.talend.libraries/jt400_V5R2/6.0.0"  REQUIRED_IF="DB_VERSION == 'jt400_V5R2.jar'" />
-       <IMPORT NAME="Driver-V5R3_V6R1" MODULE="jt400_V5R3.jar" MVN="mvn:org.talend.libraries/jt400_V5R3/6.0.0"  REQUIRED_IF="DB_VERSION == 'jt400_V5R3.jar'" />
        <IMPORT NAME="Driver-V6R1_V7R2" MODULE="jt400_V6R1.jar" MVN="mvn:org.talend.libraries/jt400_V6R1/6.0.0"  REQUIRED_IF="DB_VERSION == 'jt400_V6R1.jar'" />
        <IMPORT NAME="Driver-V7R1_V7R3" MODULE="jt400-9.8.jar" MVN="mvn:net.sf.jt400/jt400/9.8"  REQUIRED_IF="DB_VERSION == 'jt400-9.8.jar'" />
-       <IMPORT NAME="slf4j-api-1.7.25.jar" MODULE="slf4j-api-1.7.25.jar" MVN="mvn:org.slf4j/slf4j-api/1.7.25" REQUIRED_IF="USE_SHARED_CONNECTION =='true'" />
-       <IMPORT NAME="slf4j-log4j12-1.7.25.jar" MODULE="slf4j-log4j12-1.7.25.jar" MVN="mvn:org.slf4j/slf4j-log4j12/1.7.25" REQUIRED_IF="USE_SHARED_CONNECTION =='true'" />
+       <IMPORT NAME="slf4j-api-1.7.29.jar" MODULE="slf4j-api-1.7.29.jar" MVN="mvn:org.slf4j/slf4j-api/1.7.29" REQUIRED_IF="USE_SHARED_CONNECTION =='true'" />
+       <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'" />
      </IMPORTS>
 	</CODEGENERATION>
 

main/plugins/org.talend.designer.components.localprovider/components/tAS400Connection/tAS400Connection_messages.properties

@@ -10,8 +10,6 @@ PORT.NAME=Port
 PROPERTIES.NAME=Additional JDBC Parameters
 USER.NAME=Username
 DB_VERSION.NAME=DB Version
-DB_VERSION.ITEM.V5R2_V5R4=V5R2 to V5R4 (Deprecated)
-DB_VERSION.ITEM.V5R3_V6R1=V5R3 to V6R1 (Deprecated)
 DB_VERSION.ITEM.V6R1_V7R2=V6R1 to V7R2
 DB_VERSION.ITEM.V7R1_V7R3=V7R1 to V7R3
 USE_SHARED_CONNECTION.NAME=Use or register a shared DB Connection

main/plugins/org.talend.designer.components.localprovider/components/tAS400Connection/tAS400Connection_messages_fr.properties

@@ -10,8 +10,6 @@ PORT.NAME=Port
 PROPERTIES.NAME=Param\u00E8tres suppl\u00E9mentaires JDBC
 USER.NAME=Utilisateur
 DB_VERSION.NAME=Version de la base de donn\u00E9es
-DB_VERSION.ITEM.V5R2_V5R4=V5R2 \u00E0 V5R4 (d\u00E9pr\u00E9ci\u00E9e)
-DB_VERSION.ITEM.V5R3_V6R1=V5R3 \u00E0 V6R1 (D\u00E9pr\u00E9ci\u00E9)
 DB_VERSION.ITEM.V6R1_V7R2=V6R1 \u00E0 V7R2
 DB_VERSION.ITEM.V7R1_V7R3=V7R1 \u00E0 V7R3
 USE_SHARED_CONNECTION.NAME=Utiliser ou enregistrer une connexion partag\u00E9e \u00E0 une base de donn\u00E9es

main/plugins/org.talend.designer.components.localprovider/components/tAS400Connection/tAS400Connection_messages_ja.properties

@@ -10,8 +10,6 @@ PORT.NAME=\u30DD\u30FC\u30C8
 PROPERTIES.NAME=\u8FFD\u52A0\u306EJDBC\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC
 USER.NAME=\u30E6\u30FC\u30B6\u30FC\u540D
 DB_VERSION.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30D0\u30FC\u30B8\u30E7\u30F3
-DB_VERSION.ITEM.V5R2_V5R4=V5R2\u304B\u3089V5R4 (\u975E\u63A8\u5968)
-DB_VERSION.ITEM.V5R3_V6R1=V5R3\u304B\u3089V6R1 (\u975E\u63A8\u5968)
 DB_VERSION.ITEM.V6R1_V7R2=V6R1\u304B\u3089V7R2
 DB_VERSION.ITEM.V7R1_V7R3=V7R1\u304B\u3089V7R3
 USE_SHARED_CONNECTION.NAME=\u5171\u6709DB\u63A5\u7D9A\u306E\u4F7F\u7528\u307E\u305F\u306F\u767B\u9332

main/plugins/org.talend.designer.components.localprovider/components/tAS400Connection/tAS400Connection_messages_zh_CN.properties

@@ -10,8 +10,6 @@ PORT.NAME=\u7AEF\u53E3
 PROPERTIES.NAME=\u9644\u52A0 JDBC \u53C2\u6570
 USER.NAME=\u7528\u6237\u540D
 DB_VERSION.NAME=\u6570\u636E\u5E93\u7248\u672C
-DB_VERSION.ITEM.V5R2_V5R4=V5R2 \u5230 V5R4 (\u5DF2\u5F03\u7528)
-DB_VERSION.ITEM.V5R3_V6R1=V5R3 \u5230 V6R1 (\u5DF2\u5F03\u7528)
 DB_VERSION.ITEM.V6R1_V7R2=V6R1 \u81F3 V7R2
 DB_VERSION.ITEM.V7R1_V7R3=V7R1 \u5230 V7R3
 USE_SHARED_CONNECTION.NAME=\u4F7F\u7528\u6216\u6CE8\u518C\u5171\u4EAB\u6570\u636E\u5E93\u8FDE\u63A5

main/plugins/org.talend.designer.components.localprovider/components/tAS400Input/tAS400Input_java.xml

@@ -64,8 +64,6 @@
     <PARAMETER NAME="DB_VERSION" FIELD="CLOSED_LIST" NUM_ROW="3"
 			REPOSITORY_VALUE="DB_VERSION" SHOW_IF="(USE_EXISTING_CONNECTION == 'false')">
 			<ITEMS DEFAULT="V7R1_V7R3">
-				<ITEM NAME="V5R2_V5R4" VALUE="jt400_V5R2.jar"/>
-				<ITEM NAME="V5R3_V6R1" VALUE="jt400_V5R3.jar" />
                 <ITEM NAME="V6R1_V7R2" VALUE="jt400_V6R1.jar" />
                 <ITEM NAME="V7R1_V7R3" VALUE="jt400-9.8.jar" />
 			</ITEMS>
@@ -199,12 +197,27 @@
 			<ITEM NAME="TRIM" FIELD="CHECK"></ITEM>
 		</ITEMS>
 	</PARAMETER>
+	
+	<PARAMETER
+      NAME="SET_QUERY_TIMEOUT"
+      FIELD="CHECK"
+      NUM_ROW="50"
+      >
+      <DEFAULT>false</DEFAULT>
+    </PARAMETER>
+
+    <PARAMETER
+      NAME="QUERY_TIMEOUT_IN_SECONDS"
+      FIELD="TEXT"
+      NUM_ROW="50"
+      SHOW_IF="SET_QUERY_TIMEOUT == 'true'"
+      >
+      <DEFAULT>30</DEFAULT>
+    </PARAMETER>
    </ADVANCED_PARAMETERS>
 
    <CODEGENERATION>
      <IMPORTS>
-       <IMPORT NAME="Driver-V5R2_V5R4" MODULE="jt400_V5R2.jar" MVN="mvn:org.talend.libraries/jt400_V5R2/6.0.0"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DB_VERSION == 'jt400_V5R2.jar')" />
-       <IMPORT NAME="Driver-V5R3_V6R1" MODULE="jt400_V5R3.jar" MVN="mvn:org.talend.libraries/jt400_V5R3/6.0.0"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DB_VERSION == 'jt400_V5R3.jar')" />
        <IMPORT NAME="Driver-V6R1_V7R2" MODULE="jt400_V6R1.jar" MVN="mvn:org.talend.libraries/jt400_V6R1/6.0.0"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DB_VERSION == 'jt400_V6R1.jar')" />
        <IMPORT NAME="Driver-V7R1_V7R3" MODULE="jt400-9.8.jar" MVN="mvn:net.sf.jt400/jt400/9.8"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DB_VERSION == 'jt400-9.8.jar')" />
      </IMPORTS>

main/plugins/org.talend.designer.components.localprovider/components/tAS400Input/tAS400Input_messages.properties

@@ -14,15 +14,15 @@ TRIM_COLUMN.NAME=Trim column
 TRIM_COLUMN.ITEM.TRIM=Trim
 TABLE.NAME=Table Name
 DB_VERSION.NAME=DB Version
-DB_VERSION.ITEM.V5R2_V5R4=V5R2 to V5R4 (Deprecated)
-DB_VERSION.ITEM.V5R3_V6R1=V5R3 to V6R1 (Deprecated)
 DB_VERSION.ITEM.V6R1_V7R2=V6R1 to V7R2
 DB_VERSION.ITEM.V7R1_V7R3=V7R1 to V7R3
 MAPPING.NAME=Mapping
+SET_QUERY_TIMEOUT.NAME=Set Query Timeout
+QUERY_TIMEOUT_IN_SECONDS.NAME=Timeout (seconds)
 NB_LINE.NAME=Number of line
 GUESS_SCHEMA.NAME=Guess Schema
 CONNECTION.NAME=Component List
 PROPERTY.NAME=Property Type
 TYPE.NAME=Database Driver
 SCHEMA.NAME=Schema
-ENCODING.NAME=Encoding
+ENCODING.NAME=Encoding

main/plugins/org.talend.designer.components.localprovider/components/tAS400Input/tAS400Input_messages_fr.properties

@@ -14,11 +14,11 @@ TRIM_COLUMN.NAME=Colonnes \u00E0 rogner
 TRIM_COLUMN.ITEM.TRIM=Supprimer les espaces en d\u00E9but et en fin de champ
 TABLE.NAME=Nom de la table
 DB_VERSION.NAME=Version de la base de donn\u00E9es
-DB_VERSION.ITEM.V5R2_V5R4=V5R2 \u00E0 V5R4 (d\u00E9pr\u00E9ci\u00E9e)
-DB_VERSION.ITEM.V5R3_V6R1=V5R3 \u00E0 V6R1 (D\u00E9pr\u00E9ci\u00E9)
 DB_VERSION.ITEM.V6R1_V7R2=V6R1 \u00E0 V7R2
 DB_VERSION.ITEM.V7R1_V7R3=V7R1 \u00E0 V7R3
 MAPPING.NAME=Mapping
+SET_QUERY_TIMEOUT.NAME=Configurer le d\u00E9lai avant expiration de la requ\u00EAte
+QUERY_TIMEOUT_IN_SECONDS.NAME=D\u00E9lai avant expiration (secondes)
 NB_LINE.NAME=Nombre de lignes
 GUESS_SCHEMA.NAME=D\u00E9tecter le sch\u00E9ma
 CONNECTION.NAME=Liste des composants

main/plugins/org.talend.designer.components.localprovider/components/tAS400Input/tAS400Input_messages_ja.properties

@@ -14,11 +14,11 @@ TRIM_COLUMN.NAME=\u30AB\u30E9\u30E0\u306E\u30C8\u30EA\u30E0
 TRIM_COLUMN.ITEM.TRIM=\u30C8\u30EA\u30E0
 TABLE.NAME=\u30C6\u30FC\u30D6\u30EB\u540D
 DB_VERSION.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30D0\u30FC\u30B8\u30E7\u30F3
-DB_VERSION.ITEM.V5R2_V5R4=V5R2\u304B\u3089V5R4 (\u975E\u63A8\u5968)
-DB_VERSION.ITEM.V5R3_V6R1=V5R3\u304B\u3089V6R1 (\u975E\u63A8\u5968)
 DB_VERSION.ITEM.V6R1_V7R2=V6R1\u304B\u3089V7R2
 DB_VERSION.ITEM.V7R1_V7R3=V7R1\u304B\u3089V7R3
 MAPPING.NAME=\u30DE\u30C3\u30D4\u30F3\u30B0
+SET_QUERY_TIMEOUT.NAME=\u30AF\u30A8\u30EA\u30FC\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8\u3092\u8A2D\u5B9A
+QUERY_TIMEOUT_IN_SECONDS.NAME=\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8\uFF08\u79D2\uFF09
 NB_LINE.NAME=\u884C\u6570
 GUESS_SCHEMA.NAME=\u30B9\u30AD\u30FC\u30DE\u306E\u63A8\u6E2C
 CONNECTION.NAME=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u30EA\u30B9\u30C8

main/plugins/org.talend.designer.components.localprovider/components/tAS400Input/tAS400Input_messages_zh_CN.properties

@@ -14,11 +14,11 @@ TRIM_COLUMN.NAME=\u526A\u88C1\u5217
 TRIM_COLUMN.ITEM.TRIM=\u526A\u88C1
 TABLE.NAME=\u8868\u540D\u79F0
 DB_VERSION.NAME=\u6570\u636E\u5E93\u7248\u672C
-DB_VERSION.ITEM.V5R2_V5R4=V5R2 \u5230 V5R4 (\u5DF2\u5F03\u7528)
-DB_VERSION.ITEM.V5R3_V6R1=V5R3 \u5230 V6R1 (\u5DF2\u5F03\u7528)
 DB_VERSION.ITEM.V6R1_V7R2=V6R1 \u81F3 V7R2
 DB_VERSION.ITEM.V7R1_V7R3=V7R1 \u5230 V7R3
 MAPPING.NAME=\u6620\u5C04
+SET_QUERY_TIMEOUT.NAME=\u8BBE\u7F6E\u67E5\u8BE2\u8D85\u65F6
+QUERY_TIMEOUT_IN_SECONDS.NAME=\u8D85\u65F6 (\u79D2)
 NB_LINE.NAME=\u884C\u6570
 GUESS_SCHEMA.NAME=\u63A8\u6D4B Schema
 CONNECTION.NAME=\u7EC4\u4EF6\u5217\u8868

main/plugins/org.talend.designer.components.localprovider/components/tAS400Output/tAS400Output_begin.javajet

@@ -49,10 +49,14 @@ skeleton="../templates/db_output_bulk.skeleton"
 	String commitEvery = ElementParameterParser.getValue(node, "__COMMIT_EVERY__");
 
 	boolean isEnableDebug = ("true").equals(ElementParameterParser.getValue(node,"__ENABLE_DEBUG_MODE__"));
-
+	
 	boolean useBatchSize = "true".equals(ElementParameterParser.getValue(node,"__USE_BATCH_SIZE__"));
 	String batchSize=ElementParameterParser.getValue(node,"__BATCH_SIZE__");
 
+	boolean setQueryTimeOut = "true".equals(ElementParameterParser.getValue(node,"__SET_QUERY_TIMEOUT__"));
+	
+	String queryTimeOutInSeconds = ElementParameterParser.getValue(node,"__QUERY_TIMEOUT_IN_SECONDS__");
+	
 	String rejectConnName = null;
 	List<? extends IConnection> rejectConns = node.getOutgoingConnections("REJECT");
 	if(rejectConns != null && rejectConns.size() > 0) {
@@ -174,43 +178,47 @@ if(columnList != null && columnList.size() > 0) {
     StringBuilder updateSetStmt = actionSQLMap.get(UPDATE_SET_STMT);
     StringBuilder updateWhereStmt = actionSQLMap.get(UPDATE_WHERE_STMT);
     StringBuilder deleteWhereStmt = actionSQLMap.get(DELETE_WHERE_STMT);
-
+    %>
+    java.sql.PreparedStatement pstmt_<%=cid %> = null;
+    java.sql.PreparedStatement pstmtInsert_<%=cid %> = null;
+    java.sql.PreparedStatement pstmtUpdate_<%=cid %> = null;
+    <%
 	if(("INSERT").equals(dataAction)) {
 	    %>
 	    String insert_<%=cid%> = "INSERT INTO " + <%=table%> + " (<%=insertColName.toString()%>) VALUES (<%=insertValueStmt.toString()%>)";
-	    java.sql.PreparedStatement pstmt_<%=cid %> = conn_<%=cid%>.prepareStatement(insert_<%=cid%>, java.sql.Statement.RETURN_GENERATED_KEYS);
+	    pstmt_<%=cid %> = conn_<%=cid%>.prepareStatement(insert_<%=cid%>, java.sql.Statement.RETURN_GENERATED_KEYS);
 		resourceMap.put("pstmt_<%=cid %>", pstmt_<%=cid %>);
 	    <%
 	} else if (("UPDATE").equals(dataAction)) {
 	    %>
 	    String update_<%=cid%> = "UPDATE " + <%=table%> + " SET <%=updateSetStmt.toString()%> WHERE <%=updateWhereStmt.toString()%>";
-	    java.sql.PreparedStatement pstmt_<%=cid %> = conn_<%=cid%>.prepareStatement(update_<%=cid%>);
+	    pstmt_<%=cid %> = conn_<%=cid%>.prepareStatement(update_<%=cid%>);
 		resourceMap.put("pstmt_<%=cid %>", pstmt_<%=cid %>);
 	    <%
 	} else if (("INSERT_OR_UPDATE").equals(dataAction)) {
 	    %>
-	    java.sql.PreparedStatement pstmt_<%=cid %> = conn_<%=cid%>.prepareStatement("SELECT COUNT(1) FROM " + <%=table%> + " WHERE <%=updateWhereStmt.toString()%>");
+	    pstmt_<%=cid %> = conn_<%=cid%>.prepareStatement("SELECT COUNT(1) FROM " + <%=table%> + " WHERE <%=updateWhereStmt.toString()%>");
 		resourceMap.put("pstmt_<%=cid %>", pstmt_<%=cid %>);
 	    String insert_<%=cid%> = "INSERT INTO " + <%=table%> + " (<%=insertColName.toString()%>) VALUES (<%=insertValueStmt.toString()%>)";
-	    java.sql.PreparedStatement pstmtInsert_<%=cid %> = conn_<%=cid%>.prepareStatement(insert_<%=cid%>);
+	    pstmtInsert_<%=cid %> = conn_<%=cid%>.prepareStatement(insert_<%=cid%>);
 		resourceMap.put("pstmtInsert_<%=cid %>", pstmtInsert_<%=cid %>);
 	    String update_<%=cid%> = "UPDATE " + <%=table%> + " SET <%=updateSetStmt.toString()%> WHERE <%=updateWhereStmt.toString()%>";
-	    java.sql.PreparedStatement pstmtUpdate_<%=cid %> = conn_<%=cid%>.prepareStatement(update_<%=cid%>);
+	    pstmtUpdate_<%=cid %> = conn_<%=cid%>.prepareStatement(update_<%=cid%>);
 		resourceMap.put("pstmtUpdate_<%=cid %>", pstmtUpdate_<%=cid %>);
 	    <%
 	} else if (("UPDATE_OR_INSERT").equals(dataAction)) {
 	    %>
 	    String update_<%=cid%> = "UPDATE " + <%=table%> + " SET <%=updateSetStmt.toString()%> WHERE <%=updateWhereStmt.toString()%>";
-	    java.sql.PreparedStatement pstmtUpdate_<%=cid %> = conn_<%=cid%>.prepareStatement(update_<%=cid%>);
+	    pstmtUpdate_<%=cid %> = conn_<%=cid%>.prepareStatement(update_<%=cid%>);
 		resourceMap.put("pstmtUpdate_<%=cid %>", pstmtUpdate_<%=cid %>);
 	    String insert_<%=cid%> = "INSERT INTO " + <%=table%> + " (<%=insertColName.toString()%>) VALUES (<%=insertValueStmt.toString()%>)";
-	    java.sql.PreparedStatement pstmtInsert_<%=cid %> = conn_<%=cid%>.prepareStatement(insert_<%=cid%>);
+	    pstmtInsert_<%=cid %> = conn_<%=cid%>.prepareStatement(insert_<%=cid%>);
 		resourceMap.put("pstmtInsert_<%=cid %>", pstmtInsert_<%=cid %>);
 	    <%
 	} else if (("DELETE").equals(dataAction)) {
 	    %>
 	    String delete_<%=cid%> = "DELETE FROM " + <%=table%> + " WHERE <%=deleteWhereStmt.toString()%>";
-	    java.sql.PreparedStatement pstmt_<%=cid %> = conn_<%=cid%>.prepareStatement(delete_<%=cid%>);
+	    pstmt_<%=cid %> = conn_<%=cid%>.prepareStatement(delete_<%=cid%>);
 		resourceMap.put("pstmt_<%=cid %>", pstmt_<%=cid %>);
 	    <%
 	}
@@ -220,6 +228,20 @@ if(columnList != null && columnList.size() > 0) {
        	<%@ include file="../templates/DB/Output/splitSQLForAllDBInBegin.javajet" %>
         <%
     }
+    if(setQueryTimeOut) {
+    	if(("INSERT").equals(dataAction) || ("UPDATE").equals(dataAction) 
+			|| ("DELETE").equals(dataAction) || ("INSERT_OR_UPDATE").equals(dataAction)) {
+%>
+			pstmt_<%=cid %>.setQueryTimeout(<%= queryTimeOutInSeconds %>);
+<%
+    	}
+    	if(("UPDATE_OR_INSERT").equals(dataAction) || ("INSERT_OR_UPDATE").equals(dataAction)) {
+%>
+			pstmtUpdate_<%=cid %>.setQueryTimeout(<%= queryTimeOutInSeconds %>);
+			pstmtInsert_<%=cid %>.setQueryTimeout(<%= queryTimeOutInSeconds %>);
+<%
+    	}
+	}
 }
 } // end isDynamic
 if(isDynamic) {

main/plugins/org.talend.designer.components.localprovider/components/tAS400Output/tAS400Output_java.xml

@@ -51,8 +51,6 @@
     <PARAMETER NAME="DB_VERSION" FIELD="CLOSED_LIST" NUM_ROW="2"
 			REPOSITORY_VALUE="DB_VERSION" SHOW_IF="(USE_EXISTING_CONNECTION == 'false')">
 			<ITEMS DEFAULT="V7R1_V7R3">
-				<ITEM NAME="V5R2_V5R4" VALUE="jt400_V5R2.jar"/>
-				<ITEM NAME="V5R3_V6R1" VALUE="jt400_V5R3.jar" />
                 <ITEM NAME="V6R1_V7R2" VALUE="jt400_V6R1.jar" />
                 <ITEM NAME="V7R1_V7R3" VALUE="jt400-9.8.jar" />
 			</ITEMS>
@@ -322,13 +320,28 @@
 		NUM_ROW="20">
 		  <DEFAULT>false</DEFAULT>
 	</PARAMETER>
+	
+	<PARAMETER
+      NAME="SET_QUERY_TIMEOUT"
+      FIELD="CHECK"
+      NUM_ROW="30"
+      >
+      <DEFAULT>false</DEFAULT>
+    </PARAMETER>
+
+    <PARAMETER
+      NAME="QUERY_TIMEOUT_IN_SECONDS"
+      FIELD="TEXT"
+      NUM_ROW="30"
+      SHOW_IF="SET_QUERY_TIMEOUT == 'true'"
+      >
+      <DEFAULT>30</DEFAULT>
+    </PARAMETER>
 
   </ADVANCED_PARAMETERS>
 
    <CODEGENERATION>
      <IMPORTS>
-       <IMPORT NAME="Driver-V5R2_V5R4" MODULE="jt400_V5R2.jar" MVN="mvn:org.talend.libraries/jt400_V5R2/6.0.0"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DB_VERSION == 'jt400_V5R2.jar')" />
-       <IMPORT NAME="Driver-V5R3_V6R1" MODULE="jt400_V5R3.jar" MVN="mvn:org.talend.libraries/jt400_V5R3/6.0.0"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DB_VERSION == 'jt400_V5R3.jar')" />
        <IMPORT NAME="Driver-V6R1_V7R2" MODULE="jt400_V6R1.jar" MVN="mvn:org.talend.libraries/jt400_V6R1/6.0.0"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DB_VERSION == 'jt400_V6R1.jar')" />
        <IMPORT NAME="Driver-V7R1_V7R3" MODULE="jt400-9.8.jar" MVN="mvn:net.sf.jt400/jt400/9.8"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DB_VERSION == 'jt400-9.8.jar')" />
      </IMPORTS>

main/plugins/org.talend.designer.components.localprovider/components/tAS400Output/tAS400Output_main.javajet

@@ -41,10 +41,13 @@ skeleton="../templates/db_output_bulk.skeleton"
     String batchSize =ElementParameterParser.getValue(node, "__BATCH_SIZE__");
     boolean useExistingConnection = "true".equals(ElementParameterParser.getValue(node,"__USE_EXISTING_CONNECTION__"));
     boolean isEnableDebug = ("true").equals(ElementParameterParser.getValue(node,"__ENABLE_DEBUG_MODE__"));
-
 	//feature:2880
     getManager(dbmsId, cid, node);
     boolean whereSupportNull = ElementParameterParser.getValue(node, "__SUPPORT_NULL_WHERE__").equals("true");
+    
+    boolean setQueryTimeOut = "true".equals(ElementParameterParser.getValue(node,"__SET_QUERY_TIMEOUT__"));
+    
+    String queryTimeOutInSeconds = ElementParameterParser.getValue(node,"__QUERY_TIMEOUT_IN_SECONDS__");
 
 	String incomingConnName = null;
 	List<IMetadataColumn> columnList = getColumnList(node);
@@ -227,6 +230,20 @@ skeleton="../templates/db_output_bulk.skeleton"
        	<%@ include file="../templates/DB/Output/splitSQLForAllDBInDynamicMain.javajet" %>
         <%
     }
+    if(setQueryTimeOut) {
+    	if(("INSERT").equals(dataAction) || ("UPDATE").equals(dataAction) 
+			|| ("DELETE").equals(dataAction) || ("INSERT_OR_UPDATE").equals(dataAction)) {
+%>
+			pstmt_<%=cid %>.setQueryTimeout(<%= queryTimeOutInSeconds %>);
+<%
+    	}
+    	if(("UPDATE_OR_INSERT").equals(dataAction) || ("INSERT_OR_UPDATE").equals(dataAction)) {
+%>
+			pstmtUpdate_<%=cid %>.setQueryTimeout(<%= queryTimeOutInSeconds %>);
+			pstmtInsert_<%=cid %>.setQueryTimeout(<%= queryTimeOutInSeconds %>);
+<%
+    	}
+	}
 }
 %>
 	}

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

@@ -58,8 +58,6 @@ USE_EXISTING_CONNECTION.NAME=Using an existing connection
 USE_FIELD_OPTIONS.NAME=Use field options
 ENABLE_DEBUG_MODE.NAME=Debug query mode
 DB_VERSION.NAME=DB Version
-DB_VERSION.ITEM.V5R2_V5R4=V5R2 to V5R4 (Deprecated)
-DB_VERSION.ITEM.V5R3_V6R1=V5R3 to V6R1 (Deprecated)
 DB_VERSION.ITEM.V6R1_V7R2=V6R1 to V7R2
 DB_VERSION.ITEM.V7R1_V7R3=V7R1 to V7R3
 NB_LINE_UPDATED.NAME=NB Line Updated
@@ -73,3 +71,5 @@ CONNECTION.NAME=Component List
 USE_BATCH_SIZE.NAME=Use Batch Size
 BATCH_SIZE.NAME=Batch Size
 NB_LINE_REJECTED.NAME=NB Line Rejected
+SET_QUERY_TIMEOUT.NAME=Set Query Timeout
+QUERY_TIMEOUT_IN_SECONDS.NAME=Timeout (seconds)

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

@@ -58,8 +58,6 @@ USE_EXISTING_CONNECTION.NAME=Utiliser une connexion existante
 USE_FIELD_OPTIONS.NAME=Utiliser les options de champ
 ENABLE_DEBUG_MODE.NAME=Mode de d\u00E9bogage de requ\u00EAte
 DB_VERSION.NAME=Version de la base de donn\u00E9es
-DB_VERSION.ITEM.V5R2_V5R4=V5R2 \u00E0 V5R4 (d\u00E9pr\u00E9ci\u00E9e)
-DB_VERSION.ITEM.V5R3_V6R1=V5R3 \u00E0 V6R1 (D\u00E9pr\u00E9ci\u00E9)
 DB_VERSION.ITEM.V6R1_V7R2=V6R1 \u00E0 V7R2
 DB_VERSION.ITEM.V7R1_V7R3=V7R1 \u00E0 V7R3
 NB_LINE_UPDATED.NAME=Nombre de lignes mises \u00E0 jour
@@ -73,3 +71,5 @@ CONNECTION.NAME=Liste des composants
 USE_BATCH_SIZE.NAME=Utiliser la taille des lots
 BATCH_SIZE.NAME=Taille des lots
 NB_LINE_REJECTED.NAME=Nombre de lignes rejet\u00E9es
+SET_QUERY_TIMEOUT.NAME=Configurer le d\u00E9lai avant expiration de la requ\u00EAte
+QUERY_TIMEOUT_IN_SECONDS.NAME=D\u00E9lai avant expiration (secondes)

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

@@ -55,11 +55,9 @@ TABLE_ACTION.NAME=\u30C6\u30FC\u30D6\u30EB\u306E\u64CD\u4F5C
 USER.NAME=\u30E6\u30FC\u30B6\u30FC\u540D
 USE_COMMIT_CONTROL.NAME=\u30B3\u30DF\u30C3\u30C8\u5236\u5FA1\u3092\u4F7F\u3046
 USE_EXISTING_CONNECTION.NAME=\u65E2\u5B58\u306E\u63A5\u7D9A\u3092\u4F7F\u7528
-USE_FIELD_OPTIONS.NAME=\u30D5\u30A3\u30FC\u30EB\u30C9\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u4F7F\u7528
+USE_FIELD_OPTIONS.NAME=\u30D5\u30A3\u30FC\u30EB\u30C9\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4F7F\u7528
 ENABLE_DEBUG_MODE.NAME=\u30C7\u30D0\u30C3\u30B0\u30AF\u30A8\u30EA\u30FC\u30E2\u30FC\u30C9
 DB_VERSION.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30D0\u30FC\u30B8\u30E7\u30F3
-DB_VERSION.ITEM.V5R2_V5R4=V5R2\u304B\u3089V5R4 (\u975E\u63A8\u5968)
-DB_VERSION.ITEM.V5R3_V6R1=V5R3\u304B\u3089V6R1 (\u975E\u63A8\u5968)
 DB_VERSION.ITEM.V6R1_V7R2=V6R1\u304B\u3089V7R2
 DB_VERSION.ITEM.V7R1_V7R3=V7R1\u304B\u3089V7R3
 NB_LINE_UPDATED.NAME=NB\u884C\u66F4\u65B0\u6E08\u307F
@@ -73,3 +71,5 @@ CONNECTION.NAME=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u30EA\u30B9\u30C8
 USE_BATCH_SIZE.NAME=\u30D0\u30C3\u30C1\u30B5\u30A4\u30BA\u3092\u4F7F\u7528
 BATCH_SIZE.NAME=\u30D0\u30C3\u30C1\u30B5\u30A4\u30BA
 NB_LINE_REJECTED.NAME=\u30EA\u30B8\u30A7\u30AF\u30C8\u884C\u6570
+SET_QUERY_TIMEOUT.NAME=\u30AF\u30A8\u30EA\u30FC\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8\u3092\u8A2D\u5B9A
+QUERY_TIMEOUT_IN_SECONDS.NAME=\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8\uFF08\u79D2\uFF09

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

@@ -58,8 +58,6 @@ USE_EXISTING_CONNECTION.NAME=\u4F7F\u7528\u73B0\u6709\u8FDE\u63A5
 USE_FIELD_OPTIONS.NAME=\u4F7F\u7528\u5B57\u6BB5\u9009\u9879
 ENABLE_DEBUG_MODE.NAME=\u8C03\u8BD5\u67E5\u8BE2\u6A21\u5F0F
 DB_VERSION.NAME=\u6570\u636E\u5E93\u7248\u672C
-DB_VERSION.ITEM.V5R2_V5R4=V5R2 \u5230 V5R4 (\u5DF2\u5F03\u7528)
-DB_VERSION.ITEM.V5R3_V6R1=V5R3 \u5230 V6R1 (\u5DF2\u5F03\u7528)
 DB_VERSION.ITEM.V6R1_V7R2=V6R1 \u81F3 V7R2
 DB_VERSION.ITEM.V7R1_V7R3=V7R1 \u5230 V7R3
 NB_LINE_UPDATED.NAME=\u66F4\u65B0\u7684\u884C\u6570
@@ -73,3 +71,5 @@ CONNECTION.NAME=\u7EC4\u4EF6\u5217\u8868
 USE_BATCH_SIZE.NAME=\u4F7F\u7528\u6279\u5904\u7406\u5927\u5C0F
 BATCH_SIZE.NAME=\u6279\u5904\u7406\u5927\u5C0F
 NB_LINE_REJECTED.NAME=\u62D2\u7EDD\u7684\u884C\u6570
+SET_QUERY_TIMEOUT.NAME=\u8BBE\u7F6E\u67E5\u8BE2\u8D85\u65F6
+QUERY_TIMEOUT_IN_SECONDS.NAME=\u8D85\u65F6 (\u79D2)

main/plugins/org.talend.designer.components.localprovider/components/tAS400Row/tAS400Row_java.xml

@@ -67,8 +67,6 @@
     <PARAMETER NAME="DB_VERSION" FIELD="CLOSED_LIST" NUM_ROW="3"
 			REPOSITORY_VALUE="DB_VERSION" SHOW_IF="(USE_EXISTING_CONNECTION == 'false')">
 			<ITEMS DEFAULT="V7R1_V7R3">
-				<ITEM NAME="V5R2_V5R4" VALUE="jt400_V5R2.jar"/>
-				<ITEM NAME="V5R3_V6R1" VALUE="jt400_V5R3.jar"/>
                 <ITEM NAME="V6R1_V7R2" VALUE="jt400_V6R1.jar"/>
                 <ITEM NAME="V7R1_V7R3" VALUE="jt400-9.8.jar" />
 			</ITEMS>
@@ -251,12 +249,27 @@
 		REQUIRED="true" SHOW_IF="USE_EXISTING_CONNECTION == 'false'">
 		<DEFAULT>10000</DEFAULT>
 	</PARAMETER>
+	
+	<PARAMETER
+      NAME="SET_QUERY_TIMEOUT"
+      FIELD="CHECK"
+      NUM_ROW="10"
+      >
+      <DEFAULT>false</DEFAULT>
+    </PARAMETER>
+
+    <PARAMETER
+      NAME="QUERY_TIMEOUT_IN_SECONDS"
+      FIELD="TEXT"
+      NUM_ROW="10"
+      SHOW_IF="SET_QUERY_TIMEOUT == 'true'"
+      >
+      <DEFAULT>30</DEFAULT>
+    </PARAMETER>
   </ADVANCED_PARAMETERS>
 
    <CODEGENERATION>
      <IMPORTS>
-       <IMPORT NAME="Driver-V5R2_V5R4" MODULE="jt400_V5R2.jar" MVN="mvn:org.talend.libraries/jt400_V5R2/6.0.0"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DB_VERSION == 'jt400_V5R2.jar')" />
-       <IMPORT NAME="Driver-V5R3_V6R1" MODULE="jt400_V5R3.jar" MVN="mvn:org.talend.libraries/jt400_V5R3/6.0.0"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DB_VERSION == 'jt400_V5R3.jar')" />
        <IMPORT NAME="Driver-V6R1_V7R2" MODULE="jt400_V6R1.jar" MVN="mvn:org.talend.libraries/jt400_V6R1/6.0.0"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DB_VERSION == 'jt400_V6R1.jar')" />
        <IMPORT NAME="Driver-V7R1_V7R3" MODULE="jt400-9.8.jar" MVN="mvn:net.sf.jt400/jt400/9.8"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DB_VERSION == 'jt400-9.8.jar')" />
      </IMPORTS>

main/plugins/org.talend.designer.components.localprovider/components/tAS400Row/tAS400Row_messages.properties

@@ -1,52 +1,53 @@
-COMMIT_EVERY.NAME=Commit every
-DBD-DB2.INFO=Required
-DBNAME.NAME=Database
-DIE_ON_ERROR.NAME=Die on error
-ENCODING.NAME=Encoding
-HELP=org.talend.help.tAS400Row
-HOST.NAME=Host
-LONG_NAME=Executes an SQL query at each of Talend flow's iterations
-NB_LINE.NAME=Number of line
-PASS.NAME=Password
-PROPERTIES.NAME=Additional JDBC Parameters
-QUERY.NAME=Query
-REJECT.LINK=Rejects
-REJECT.MENU=Rejects
-SCHEMA_DB.NAME=Schema
-USER.NAME=Username
-USE_EXISTING_CONNECTION.NAME=Using an existing connection
-PROPAGATE_RECORD_SET.NAME=Propagate QUERY's recordset
-RECORD_SET_COLUMN.NAME=use column
-TABLE.NAME=Table Name
-DB_VERSION.NAME=DB Version
-DB_VERSION.ITEM.V5R2_V5R4=V5R2 to V5R4 (Deprecated)
-DB_VERSION.ITEM.V5R3_V6R1=V5R3 to V6R1 (Deprecated)
-DB_VERSION.ITEM.V6R1_V7R2=V6R1 to V7R2
-DB_VERSION.ITEM.V7R1_V7R3=V7R1 to V7R3
-TYPE.NAME=Database Driver
-PROPERTY.NAME=Property Type
-CONNECTION.NAME=Component List
-SCHEMA_FLOW.NAME=Schema
-SCHEMA_REJECT.NAME=Reject Schema
-QUERYSTORE.NAME=Query Type
-USE_PREPAREDSTATEMENT.NAME=Use PreparedStatement
-SET_PREPAREDSTATEMENT_PARAMETERS.NAME=Set PreparedStatement Parameters
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_INDEX=Parameter Index
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE=Parameter Type
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.BigDecimal=BigDecimal
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Blob=Blob
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Boolean=Boolean
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Byte=Byte
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Bytes=Bytes
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Clob=Clob
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Date=Date
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Double=Double
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Float=Float
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Int=Int
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Long=Long
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Object=Object
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Short=Short
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.String=String
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Time=Time
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Null=Null
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_VALUE=Parameter Value
+COMMIT_EVERY.NAME=Commit every
+DBD-DB2.INFO=Required
+DBNAME.NAME=Database
+DIE_ON_ERROR.NAME=Die on error
+ENCODING.NAME=Encoding
+HELP=org.talend.help.tAS400Row
+HOST.NAME=Host
+LONG_NAME=Executes an SQL query at each of Talend flow's iterations
+NB_LINE.NAME=Number of line
+PASS.NAME=Password
+PROPERTIES.NAME=Additional JDBC Parameters
+QUERY.NAME=Query
+REJECT.LINK=Rejects
+REJECT.MENU=Rejects
+SCHEMA_DB.NAME=Schema
+USER.NAME=Username
+USE_EXISTING_CONNECTION.NAME=Using an existing connection
+PROPAGATE_RECORD_SET.NAME=Propagate QUERY's recordset
+RECORD_SET_COLUMN.NAME=use column
+TABLE.NAME=Table Name
+DB_VERSION.NAME=DB Version
+DB_VERSION.ITEM.V6R1_V7R2=V6R1 to V7R2
+DB_VERSION.ITEM.V7R1_V7R3=V7R1 to V7R3
+TYPE.NAME=Database Driver
+PROPERTY.NAME=Property Type
+CONNECTION.NAME=Component List
+SCHEMA_FLOW.NAME=Schema
+SCHEMA_REJECT.NAME=Reject Schema
+QUERYSTORE.NAME=Query Type
+USE_PREPAREDSTATEMENT.NAME=Use PreparedStatement
+SET_PREPAREDSTATEMENT_PARAMETERS.NAME=Set PreparedStatement Parameters
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_INDEX=Parameter Index
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE=Parameter Type
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.BigDecimal=BigDecimal
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Blob=Blob
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Boolean=Boolean
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Byte=Byte
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Bytes=Bytes
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Clob=Clob
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Date=Date
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Double=Double
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Float=Float
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Int=Int
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Long=Long
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Object=Object
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Short=Short
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.String=String
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Time=Time
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Null=Null
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_VALUE=Parameter Value
+
+SET_QUERY_TIMEOUT.NAME=Set Query Timeout
+QUERY_TIMEOUT_IN_SECONDS.NAME=Timeout (seconds)

main/plugins/org.talend.designer.components.localprovider/components/tAS400Row/tAS400Row_messages_fr.properties

@@ -1,52 +1,53 @@
-COMMIT_EVERY.NAME=Commiter tous les
-DBD-DB2.INFO=Requis
-DBNAME.NAME=Base de donn\u00E9es
-DIE_ON_ERROR.NAME=Arr\u00EAter en cas d'erreur
-ENCODING.NAME=Encodage
-HELP=org.talend.help.tAS400Row
-HOST.NAME=H\u00F4te
-LONG_NAME=Ex\u00E9cute une requ\u00EAte SQL \u00E0 chaque it\u00E9ration de flux Talend
-NB_LINE.NAME=Nombre de lignes
-PASS.NAME=Mot de passe
-PROPERTIES.NAME=Param\u00E8tres suppl\u00E9mentaires JDBC
-QUERY.NAME=Requ\u00EAte
-REJECT.LINK=Rejects
-REJECT.MENU=Rejects
-SCHEMA_DB.NAME=Sch\u00E9ma
-USER.NAME=Utilisateur
-USE_EXISTING_CONNECTION.NAME=Utiliser une connexion existante
-PROPAGATE_RECORD_SET.NAME=Ins\u00E9rer les r\u00E9sultats de la requ\u00EAte dans une colonne du flux en cours
-RECORD_SET_COLUMN.NAME=Utiliser colonne
-TABLE.NAME=Nom de la table
-DB_VERSION.NAME=Version de la base de donn\u00E9es
-DB_VERSION.ITEM.V5R2_V5R4=V5R2 \u00E0 V5R4 (d\u00E9pr\u00E9ci\u00E9e)
-DB_VERSION.ITEM.V5R3_V6R1=V5R3 \u00E0 V6R1 (D\u00E9pr\u00E9ci\u00E9)
-DB_VERSION.ITEM.V6R1_V7R2=V6R1 \u00E0 V7R2
-DB_VERSION.ITEM.V7R1_V7R3=V7R1 \u00E0 V7R3
-TYPE.NAME=Pilote de la base de donn\u00E9es
-PROPERTY.NAME=Type de propri\u00E9t\u00E9
-CONNECTION.NAME=Liste des composants
-SCHEMA_FLOW.NAME=Sch\u00E9ma
-SCHEMA_REJECT.NAME=Rejeter le sch\u00E9ma
-QUERYSTORE.NAME=Type de requ\u00EAte
-USE_PREPAREDSTATEMENT.NAME=Utiliser instruction pr\u00E9par\u00E9e
-SET_PREPAREDSTATEMENT_PARAMETERS.NAME=D\u00E9finir les param\u00E8tres de l'instruction pr\u00E9par\u00E9e
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_INDEX=Index des param\u00E8tres
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE=Type de param\u00E8tre
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.BigDecimal=BigDecimal
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Blob=Blob
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Boolean=Bool\u00E9en
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Byte=Octet
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Bytes=Bytes
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Clob=Clob
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Date=Date
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Double=Double
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Float=Float
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Int=Int
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Long=Long
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Object=Object
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Short=Short
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.String=Cha\u00EEne de caract\u00E8res
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Time=Heure
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Null=Null
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_VALUE=Valeur du param\u00E8tre
+COMMIT_EVERY.NAME=Commiter tous les
+DBD-DB2.INFO=Requis
+DBNAME.NAME=Base de donn\u00E9es
+DIE_ON_ERROR.NAME=Arr\u00EAter en cas d'erreur
+ENCODING.NAME=Encodage
+HELP=org.talend.help.tAS400Row
+HOST.NAME=H\u00F4te
+LONG_NAME=Ex\u00E9cute une requ\u00EAte SQL \u00E0 chaque it\u00E9ration de flux Talend
+NB_LINE.NAME=Nombre de lignes
+PASS.NAME=Mot de passe
+PROPERTIES.NAME=Param\u00E8tres suppl\u00E9mentaires JDBC
+QUERY.NAME=Requ\u00EAte
+REJECT.LINK=Rejects
+REJECT.MENU=Rejects
+SCHEMA_DB.NAME=Sch\u00E9ma
+USER.NAME=Utilisateur
+USE_EXISTING_CONNECTION.NAME=Utiliser une connexion existante
+PROPAGATE_RECORD_SET.NAME=Ins\u00E9rer les r\u00E9sultats de la requ\u00EAte dans une colonne du flux en cours
+RECORD_SET_COLUMN.NAME=Utiliser colonne
+TABLE.NAME=Nom de la table
+DB_VERSION.NAME=Version de la base de donn\u00E9es
+DB_VERSION.ITEM.V6R1_V7R2=V6R1 \u00E0 V7R2
+DB_VERSION.ITEM.V7R1_V7R3=V7R1 \u00E0 V7R3
+TYPE.NAME=Pilote de la base de donn\u00E9es
+PROPERTY.NAME=Type de propri\u00E9t\u00E9
+CONNECTION.NAME=Liste des composants
+SCHEMA_FLOW.NAME=Sch\u00E9ma
+SCHEMA_REJECT.NAME=Rejeter le sch\u00E9ma
+QUERYSTORE.NAME=Type de requ\u00EAte
+USE_PREPAREDSTATEMENT.NAME=Utiliser instruction pr\u00E9par\u00E9e
+SET_PREPAREDSTATEMENT_PARAMETERS.NAME=D\u00E9finir les param\u00E8tres de l'instruction pr\u00E9par\u00E9e
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_INDEX=Index des param\u00E8tres
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE=Type de param\u00E8tre
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.BigDecimal=BigDecimal
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Blob=Blob
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Boolean=Bool\u00E9en
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Byte=Octet
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Bytes=Bytes
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Clob=Clob
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Date=Date
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Double=Double
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Float=Float
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Int=Int
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Long=Long
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Object=Object
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Short=Short
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.String=Cha\u00EEne de caract\u00E8res
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Time=Heure
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Null=Null
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_VALUE=Valeur du param\u00E8tre
+
+SET_QUERY_TIMEOUT.NAME=Configurer le d\u00E9lai avant expiration de la requ\u00EAte
+QUERY_TIMEOUT_IN_SECONDS.NAME=D\u00E9lai avant expiration (secondes)

main/plugins/org.talend.designer.components.localprovider/components/tAS400Row/tAS400Row_messages_ja.properties

@@ -1,52 +1,53 @@
-COMMIT_EVERY.NAME=\u30B3\u30DF\u30C3\u30C8\u3059\u308B\u9593\u9694
-DBD-DB2.INFO=\u5FC5\u9808
-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.tAS400Row
-HOST.NAME=\u30DB\u30B9\u30C8
-LONG_NAME=\u5404Talend\u30D5\u30ED\u30FC\u306E\u53CD\u5FA9\u3067SQL\u30AF\u30A8\u30EA\u30FC\u3092\u5B9F\u884C\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
-QUERY.NAME=\u30AF\u30A8\u30EA\u30FC
-REJECT.LINK=\u30EA\u30B8\u30A7\u30AF\u30C8
-REJECT.MENU=\u30EA\u30B8\u30A7\u30AF\u30C8
-SCHEMA_DB.NAME=\u30B9\u30AD\u30FC\u30DE
-USER.NAME=\u30E6\u30FC\u30B6\u30FC\u540D
-USE_EXISTING_CONNECTION.NAME=\u65E2\u5B58\u306E\u63A5\u7D9A\u3092\u4F7F\u7528
-PROPAGATE_RECORD_SET.NAME=QUERY\u306E\u30EC\u30B3\u30FC\u30C9\u30BB\u30C3\u30C8\u3092\u4F1D\u64AD
-RECORD_SET_COLUMN.NAME=\u30AB\u30E9\u30E0\u306E\u4F7F\u7528
-TABLE.NAME=\u30C6\u30FC\u30D6\u30EB\u540D
-DB_VERSION.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30D0\u30FC\u30B8\u30E7\u30F3
-DB_VERSION.ITEM.V5R2_V5R4=V5R2\u304B\u3089V5R4 (\u975E\u63A8\u5968)
-DB_VERSION.ITEM.V5R3_V6R1=V5R3\u304B\u3089V6R1 (\u975E\u63A8\u5968)
-DB_VERSION.ITEM.V6R1_V7R2=V6R1\u304B\u3089V7R2
-DB_VERSION.ITEM.V7R1_V7R3=V7R1\u304B\u3089V7R3
-TYPE.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30C9\u30E9\u30A4\u30D0\u30FC
-PROPERTY.NAME=\u30D7\u30ED\u30D1\u30C6\u30A3\u30BF\u30A4\u30D7
-CONNECTION.NAME=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u30EA\u30B9\u30C8
-SCHEMA_FLOW.NAME=\u30B9\u30AD\u30FC\u30DE
-SCHEMA_REJECT.NAME=\u30B9\u30AD\u30FC\u30DE\u306E\u30EA\u30B8\u30A7\u30AF\u30C8
-QUERYSTORE.NAME=\u30AF\u30A8\u30EA\u30FC\u30BF\u30A4\u30D7
-USE_PREPAREDSTATEMENT.NAME=PreparedStatement\u3092\u4F7F\u3046
-SET_PREPAREDSTATEMENT_PARAMETERS.NAME=PreparedStatement\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u306E\u8A2D\u5B9A
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_INDEX=\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u306E\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE=\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u30BF\u30A4\u30D7
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.BigDecimal=BigDecimal
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Blob=Blob
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Boolean=\u30D6\u30FC\u30EB\u5024
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Byte=\u30D0\u30A4\u30C8
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Bytes=\u30D0\u30A4\u30C8
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Clob=Clob
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Date=\u65E5\u4ED8
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Double=\u500D\u6570
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Float=Float
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Int=\u6574\u6570
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Long=Long
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Object=\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Short=Short
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.String=\u6587\u5B57\u5217
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Time=\u6642\u9593
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Null=Null
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_VALUE=\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u5024
+COMMIT_EVERY.NAME=\u30B3\u30DF\u30C3\u30C8\u3059\u308B\u9593\u9694
+DBD-DB2.INFO=\u5FC5\u9808
+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.tAS400Row
+HOST.NAME=\u30DB\u30B9\u30C8
+LONG_NAME=\u5404Talend\u30D5\u30ED\u30FC\u306E\u53CD\u5FA9\u3067SQL\u30AF\u30A8\u30EA\u30FC\u3092\u5B9F\u884C\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
+QUERY.NAME=\u30AF\u30A8\u30EA\u30FC
+REJECT.LINK=\u30EA\u30B8\u30A7\u30AF\u30C8
+REJECT.MENU=\u30EA\u30B8\u30A7\u30AF\u30C8
+SCHEMA_DB.NAME=\u30B9\u30AD\u30FC\u30DE
+USER.NAME=\u30E6\u30FC\u30B6\u30FC\u540D
+USE_EXISTING_CONNECTION.NAME=\u65E2\u5B58\u306E\u63A5\u7D9A\u3092\u4F7F\u7528
+PROPAGATE_RECORD_SET.NAME=QUERY\u306E\u30EC\u30B3\u30FC\u30C9\u30BB\u30C3\u30C8\u3092\u4F1D\u64AD
+RECORD_SET_COLUMN.NAME=\u30AB\u30E9\u30E0\u3092\u4F7F\u7528
+TABLE.NAME=\u30C6\u30FC\u30D6\u30EB\u540D
+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
+TYPE.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30C9\u30E9\u30A4\u30D0\u30FC
+PROPERTY.NAME=\u30D7\u30ED\u30D1\u30C6\u30A3\u30BF\u30A4\u30D7
+CONNECTION.NAME=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u30EA\u30B9\u30C8
+SCHEMA_FLOW.NAME=\u30B9\u30AD\u30FC\u30DE
+SCHEMA_REJECT.NAME=\u30B9\u30AD\u30FC\u30DE\u306E\u30EA\u30B8\u30A7\u30AF\u30C8
+QUERYSTORE.NAME=\u30AF\u30A8\u30EA\u30FC\u30BF\u30A4\u30D7
+USE_PREPAREDSTATEMENT.NAME=PreparedStatement\u3092\u4F7F\u7528
+SET_PREPAREDSTATEMENT_PARAMETERS.NAME=PreparedStatement\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u306E\u8A2D\u5B9A
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_INDEX=\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u306E\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE=\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u30BF\u30A4\u30D7
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.BigDecimal=BigDecimal
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Blob=Blob
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Boolean=\u30D6\u30FC\u30EB\u5024
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Byte=\u30D0\u30A4\u30C8
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Bytes=\u30D0\u30A4\u30C8
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Clob=Clob
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Date=\u65E5\u4ED8
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Double=\u500D\u6570
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Float=Float
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Int=\u6574\u6570
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Long=Long
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Object=\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Short=Short
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.String=\u6587\u5B57\u5217
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Time=\u6642\u9593
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Null=Null
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_VALUE=\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u5024
+
+SET_QUERY_TIMEOUT.NAME=\u30AF\u30A8\u30EA\u30FC\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8\u3092\u8A2D\u5B9A
+QUERY_TIMEOUT_IN_SECONDS.NAME=\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8\uFF08\u79D2\uFF09

main/plugins/org.talend.designer.components.localprovider/components/tAS400Row/tAS400Row_messages_zh_CN.properties

@@ -1,52 +1,53 @@
-COMMIT_EVERY.NAME=\u63D0\u4EA4\u95F4\u9694
-DBD-DB2.INFO=\u5FC5\u9700
-DBNAME.NAME=\u6570\u636E\u5E93
-DIE_ON_ERROR.NAME=\u9519\u8BEF\u65F6\u7EC8\u6B62
-ENCODING.NAME=\u7F16\u7801
-HELP=org.talend.help.tAS400Row
-HOST.NAME=\u4E3B\u673A
-LONG_NAME=\u5728\u6BCF\u4E2A Talend \u6D41\u8FED\u4EE3\u65F6\u6267\u884C SQL \u67E5\u8BE2
-NB_LINE.NAME=\u884C\u6570
-PASS.NAME=\u5BC6\u7801
-PROPERTIES.NAME=\u9644\u52A0 JDBC \u53C2\u6570
-QUERY.NAME=\u67E5\u8BE2
-REJECT.LINK=\u62D2\u7EDD
-REJECT.MENU=\u62D2\u7EDD
-SCHEMA_DB.NAME=Schema
-USER.NAME=\u7528\u6237\u540D
-USE_EXISTING_CONNECTION.NAME=\u4F7F\u7528\u73B0\u6709\u8FDE\u63A5
-PROPAGATE_RECORD_SET.NAME=\u4F20\u64AD QUERY \u7684\u8BB0\u5F55\u96C6
-RECORD_SET_COLUMN.NAME=\u4F7F\u7528\u5217
-TABLE.NAME=\u8868\u540D\u79F0
-DB_VERSION.NAME=\u6570\u636E\u5E93\u7248\u672C
-DB_VERSION.ITEM.V5R2_V5R4=V5R2 \u5230 V5R4 (\u5DF2\u5F03\u7528)
-DB_VERSION.ITEM.V5R3_V6R1=V5R3 \u5230 V6R1 (\u5DF2\u5F03\u7528)
-DB_VERSION.ITEM.V6R1_V7R2=V6R1 \u81F3 V7R2
-DB_VERSION.ITEM.V7R1_V7R3=V7R1 \u5230 V7R3
-TYPE.NAME=\u6570\u636E\u5E93\u9A71\u52A8
-PROPERTY.NAME=\u5C5E\u6027\u7C7B\u578B
-CONNECTION.NAME=\u7EC4\u4EF6\u5217\u8868
-SCHEMA_FLOW.NAME=Schema
-SCHEMA_REJECT.NAME=\u62D2\u7EDD Schema
-QUERYSTORE.NAME=\u67E5\u8BE2\u7C7B\u578B
-USE_PREPAREDSTATEMENT.NAME=\u4F7F\u7528 PreparedStatement
-SET_PREPAREDSTATEMENT_PARAMETERS.NAME=\u8BBE\u7F6E PreparedStatement \u53C2\u6570
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_INDEX=\u53C2\u6570\u7D22\u5F15
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE=\u53C2\u6570\u7C7B\u578B
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.BigDecimal=BigDecimal
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Blob=Blob
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Boolean=Boolean
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Byte=Byte
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Bytes=Bytes
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Clob=Clob
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Date=\u65E5\u671F
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Double=Double
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Float=Float
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Int=Int
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Long=Long
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Object=\u5BF9\u8C61
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Short=Short
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.String=String
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Time=\u65F6\u95F4
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Null=Null
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_VALUE=\u53C2\u6570\u503C
+COMMIT_EVERY.NAME=\u63D0\u4EA4\u95F4\u9694
+DBD-DB2.INFO=\u5FC5\u9700
+DBNAME.NAME=\u6570\u636E\u5E93
+DIE_ON_ERROR.NAME=\u9519\u8BEF\u65F6\u7EC8\u6B62
+ENCODING.NAME=\u7F16\u7801
+HELP=org.talend.help.tAS400Row
+HOST.NAME=\u4E3B\u673A
+LONG_NAME=\u5728\u6BCF\u4E2A Talend \u6D41\u8FED\u4EE3\u65F6\u6267\u884C SQL \u67E5\u8BE2
+NB_LINE.NAME=\u884C\u6570
+PASS.NAME=\u5BC6\u7801
+PROPERTIES.NAME=\u9644\u52A0 JDBC \u53C2\u6570
+QUERY.NAME=\u67E5\u8BE2
+REJECT.LINK=\u62D2\u7EDD
+REJECT.MENU=\u62D2\u7EDD
+SCHEMA_DB.NAME=Schema
+USER.NAME=\u7528\u6237\u540D
+USE_EXISTING_CONNECTION.NAME=\u4F7F\u7528\u73B0\u6709\u8FDE\u63A5
+PROPAGATE_RECORD_SET.NAME=\u4F20\u64AD QUERY \u7684\u8BB0\u5F55\u96C6
+RECORD_SET_COLUMN.NAME=\u4F7F\u7528\u5217
+TABLE.NAME=\u8868\u540D\u79F0
+DB_VERSION.NAME=\u6570\u636E\u5E93\u7248\u672C
+DB_VERSION.ITEM.V6R1_V7R2=V6R1 \u81F3 V7R2
+DB_VERSION.ITEM.V7R1_V7R3=V7R1 \u5230 V7R3
+TYPE.NAME=\u6570\u636E\u5E93\u9A71\u52A8
+PROPERTY.NAME=\u5C5E\u6027\u7C7B\u578B
+CONNECTION.NAME=\u7EC4\u4EF6\u5217\u8868
+SCHEMA_FLOW.NAME=Schema
+SCHEMA_REJECT.NAME=\u62D2\u7EDD Schema
+QUERYSTORE.NAME=\u67E5\u8BE2\u7C7B\u578B
+USE_PREPAREDSTATEMENT.NAME=\u4F7F\u7528 PreparedStatement
+SET_PREPAREDSTATEMENT_PARAMETERS.NAME=\u8BBE\u7F6E PreparedStatement \u53C2\u6570
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_INDEX=\u53C2\u6570\u7D22\u5F15
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE=\u53C2\u6570\u7C7B\u578B
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.BigDecimal=BigDecimal
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Blob=Blob
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Boolean=Boolean
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Byte=Byte
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Bytes=Bytes
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Clob=Clob
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Date=\u65E5\u671F
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Double=Double
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Float=Float
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Int=Int
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Long=Long
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Object=\u5BF9\u8C61
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Short=Short
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.String=String
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Time=\u65F6\u95F4
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Null=Null
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_VALUE=\u53C2\u6570\u503C
+
+SET_QUERY_TIMEOUT.NAME=\u8BBE\u7F6E\u67E5\u8BE2\u8D85\u65F6
+QUERY_TIMEOUT_IN_SECONDS.NAME=\u8D85\u65F6 (\u79D2)

main/plugins/org.talend.designer.components.localprovider/components/tAccessConnection/tAccessConnection_java.xml

@@ -118,14 +118,14 @@
 		<IMPORT NAME="Driver-JACKCESS" MODULE="jackcess-2.1.12.jar" MVN="mvn:com.healthmarketscience.jackcess/jackcess/2.1.12" REQUIRED="true"/>
 		
 		<IMPORT NAME="jackcess-encrypt-2.1.4" MODULE="jackcess-encrypt-2.1.4.jar" MVN="mvn:com.healthmarketscience.jackcess/jackcess-encrypt/2.1.4" REQUIRED="true"/>
-		<IMPORT NAME="bcprov-jdk15on-1.68" MODULE="bcprov-jdk15on-1.68.jar" MVN="mvn:org.bouncycastle/bcprov-jdk15on/1.68" REQUIRED="true"/>
+		<IMPORT NAME="bcprov-jdk15on-1.69" MODULE="bcprov-jdk15on-1.69.jar" MVN="mvn:org.bouncycastle/bcprov-jdk15on/1.69" REQUIRED="true"/>
 		<IMPORT NAME="talend-ucanaccess-utils-1.0.0" MODULE="talend-ucanaccess-utils-1.0.0.jar" MVN="mvn:org.talend.libraries/talend-ucanaccess-utils-1.0.0/6.4.0" REQUIRED="true"/>
 		
 		<IMPORT NAME="common2.6" 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="true"/>
 		<IMPORT NAME="common-logging1.1.3" MODULE="commons-logging-1.1.3.jar" MVN="mvn:commons-logging/commons-logging/1.1.3"  UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-logging-1.1.3.jar" REQUIRED="true"/>
 		
-		<IMPORT NAME="slf4j-api-1.7.25.jar" MODULE="slf4j-api-1.7.25.jar" MVN="mvn:org.slf4j/slf4j-api/1.7.25" REQUIRED_IF="USE_SHARED_CONNECTION =='true'" />
-		<IMPORT NAME="slf4j-log4j12-1.7.25.jar" MODULE="slf4j-log4j12-1.7.25.jar" MVN="mvn:org.slf4j/slf4j-log4j12/1.7.25" REQUIRED_IF="USE_SHARED_CONNECTION =='true'" />
+		<IMPORT NAME="slf4j-api-1.7.29.jar" MODULE="slf4j-api-1.7.29.jar" MVN="mvn:org.slf4j/slf4j-api/1.7.29" REQUIRED_IF="USE_SHARED_CONNECTION =='true'" />
+		<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'" />
 	</IMPORTS>
 	</CODEGENERATION>
 

main/plugins/org.talend.designer.components.localprovider/components/tAccessInput/tAccessInput_java.xml

@@ -121,7 +121,7 @@
 		<IMPORT NAME="Driver-JACKCESS" MODULE="jackcess-2.1.12.jar" MVN="mvn:com.healthmarketscience.jackcess/jackcess/2.1.12" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>
 		
 		<IMPORT NAME="jackcess-encrypt-2.1.4" MODULE="jackcess-encrypt-2.1.4.jar" MVN="mvn:com.healthmarketscience.jackcess/jackcess-encrypt/2.1.4" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>
-		<IMPORT NAME="bcprov-jdk15on-1.68" MODULE="bcprov-jdk15on-1.68.jar" MVN="mvn:org.bouncycastle/bcprov-jdk15on/1.68" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>
+		<IMPORT NAME="bcprov-jdk15on-1.69" MODULE="bcprov-jdk15on-1.69.jar" MVN="mvn:org.bouncycastle/bcprov-jdk15on/1.69" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>
 		<IMPORT NAME="talend-ucanaccess-utils-1.0.0" MODULE="talend-ucanaccess-utils-1.0.0.jar" MVN="mvn:org.talend.libraries/talend-ucanaccess-utils-1.0.0/6.4.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>
 		
 		<IMPORT NAME="common2.6" 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="(USE_EXISTING_CONNECTION == 'false')"/>

main/plugins/org.talend.designer.components.localprovider/components/tAccessOutput/tAccessOutput_java.xml

@@ -207,7 +207,7 @@
 		<IMPORT NAME="Driver-JACKCESS" MODULE="jackcess-2.1.12.jar" MVN="mvn:com.healthmarketscience.jackcess/jackcess/2.1.12" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>
 		
 		<IMPORT NAME="jackcess-encrypt-2.1.4" MODULE="jackcess-encrypt-2.1.4.jar" MVN="mvn:com.healthmarketscience.jackcess/jackcess-encrypt/2.1.4" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>
-		<IMPORT NAME="bcprov-jdk15on-1.68" MODULE="bcprov-jdk15on-1.68.jar" MVN="mvn:org.bouncycastle/bcprov-jdk15on/1.68" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>
+		<IMPORT NAME="bcprov-jdk15on-1.69" MODULE="bcprov-jdk15on-1.69.jar" MVN="mvn:org.bouncycastle/bcprov-jdk15on/1.69" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>
 		<IMPORT NAME="talend-ucanaccess-utils-1.0.0" MODULE="talend-ucanaccess-utils-1.0.0.jar" MVN="mvn:org.talend.libraries/talend-ucanaccess-utils-1.0.0/6.4.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>
 		
 		<IMPORT NAME="common2.6" 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="(USE_EXISTING_CONNECTION == 'false')"/>

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

@@ -44,7 +44,7 @@ ADD_COLS.ITEM.OPERATOR.ITEM.GREAT_THAN=\u4EE5\u4E0A
 ADD_COLS.ITEM.OPERATOR.ITEM.GREAT_EQUAL_THAN=\u4EE5\u4E0A
 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\u306E\u4F7F\u7528
+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=\u66F4\u65B0\u30AD\u30FC
 FIELD_OPTIONS.ITEM.DELETE_KEY=\u524A\u9664\u30AD\u30FC

main/plugins/org.talend.designer.components.localprovider/components/tAccessRow/tAccessRow_java.xml

@@ -181,7 +181,7 @@
 		<IMPORT NAME="Driver-JACKCESS" MODULE="jackcess-2.1.12.jar" MVN="mvn:com.healthmarketscience.jackcess/jackcess/2.1.12" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>
 		
 		<IMPORT NAME="jackcess-encrypt-2.1.4" MODULE="jackcess-encrypt-2.1.4.jar" MVN="mvn:com.healthmarketscience.jackcess/jackcess-encrypt/2.1.4" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>
-		<IMPORT NAME="bcprov-jdk15on-1.68" MODULE="bcprov-jdk15on-1.68.jar" MVN="mvn:org.bouncycastle/bcprov-jdk15on/1.68" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>
+		<IMPORT NAME="bcprov-jdk15on-1.69" MODULE="bcprov-jdk15on-1.69.jar" MVN="mvn:org.bouncycastle/bcprov-jdk15on/1.69" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>
 		<IMPORT NAME="talend-ucanaccess-utils-1.0.0" MODULE="talend-ucanaccess-utils-1.0.0.jar" MVN="mvn:org.talend.libraries/talend-ucanaccess-utils-1.0.0/6.4.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>
 		
 		<IMPORT NAME="common2.6" 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="(USE_EXISTING_CONNECTION == 'false')"/>

main/plugins/org.talend.designer.components.localprovider/components/tAccessRow/tAccessRow_messages_ja.properties

@@ -12,7 +12,7 @@ REJECT.MENU=\u30EA\u30B8\u30A7\u30AF\u30C8
 SCHEMA_DB.NAME=\u30B9\u30AD\u30FC\u30DE
 USER.NAME=\u30E6\u30FC\u30B6\u30FC\u540D
 PROPAGATE_RECORD_SET.NAME=QUERY\u306E\u30EC\u30B3\u30FC\u30C9\u30BB\u30C3\u30C8\u3092\u4F1D\u64AD
-RECORD_SET_COLUMN.NAME=\u30AB\u30E9\u30E0\u306E\u4F7F\u7528
+RECORD_SET_COLUMN.NAME=\u30AB\u30E9\u30E0\u3092\u4F7F\u7528
 DB_VERSION.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30D0\u30FC\u30B8\u30E7\u30F3
 DB_VERSION.ITEM.Access_2003=Access 2003
 DB_VERSION.ITEM.Access_2007=Access 2007
@@ -20,7 +20,7 @@ PROPERTY.NAME=\u30D7\u30ED\u30D1\u30C6\u30A3\u30BF\u30A4\u30D7
 SCHEMA.NAME=\u30B9\u30AD\u30FC\u30DE
 SCHEMA_REJECT.NAME=\u30B9\u30AD\u30FC\u30DE\u306E\u30EA\u30B8\u30A7\u30AF\u30C8
 QUERYSTORE.NAME=\u30AF\u30A8\u30EA\u30FC\u30BF\u30A4\u30D7
-USE_PREPAREDSTATEMENT.NAME=PreparedStatement\u3092\u4F7F\u3046
+USE_PREPAREDSTATEMENT.NAME=PreparedStatement\u3092\u4F7F\u7528
 SET_PREPAREDSTATEMENT_PARAMETERS.NAME=PreparedStatement\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u306E\u8A2D\u5B9A
 SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_INDEX=\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u306E\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9
 SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE=\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u30BF\u30A4\u30D7

main/plugins/org.talend.designer.components.localprovider/components/tAdvancedFileOutputXML/tAdvancedFileOutputXML_begin.inc.javajet

@@ -388,9 +388,12 @@ class GenerateToolByDom4j{
 			for(XMLNode attri:node.attributes){
 				addAttribute(currEleName,attri);
 			}
-			if(node.name.indexOf(":")>0){
+			int idx = node.name.indexOf(":");
+			if(idx > 0){
+				String prefix = node.name.substring(0, idx);
+				String localName = node.name.substring(idx + 1);
 %>
-			<%touchXMLNode.getXMLNode(currEleName);%>.setName("<%=node.name%>");
+			<%touchXMLNode.getXMLElement(currEleName);%>.setQName(org.dom4j.DocumentHelper.createQName("<%=localName%>",<%touchXMLNode.getXMLElement(currEleName);%>.getNamespaceForPrefix("<%=prefix%>")));
 <%
 			}
 			int index = 0;

main/plugins/org.talend.designer.components.localprovider/components/tAdvancedFileOutputXML/tAdvancedFileOutputXML_begin.javajet

@@ -174,7 +174,7 @@ globalMap.put("<%=cid%>_ERROR_MESSAGE",e.getMessage());
 					if (nestRoot != null) {
 						boolean isDefaultNameSpaceAtRoot = "".equals(nestRoot.getQName().getNamespace().getPrefix());
 						for (org.dom4j.Element tmp: (java.util.List<org.dom4j.Element>) nestRoot.elements()) {
-							if (("").equals(tmp.getQName().getNamespace().getURI()) && ("").equals(tmp.getQName().getNamespace().getPrefix()) && isDefaultNameSpaceAtRoot) {
+							if (isDefaultNameSpaceAtRoot && ("").equals(tmp.getQName().getNamespace().getURI()) && ("").equals(tmp.getQName().getNamespace().getPrefix())) {
 								tmp.setQName(org.dom4j.DocumentHelper.createQName(tmp.getName(), nestRoot.getQName().getNamespace()));
 							}
 							replaceDefaultNameSpace(tmp);

main/plugins/org.talend.designer.components.localprovider/components/tAdvancedHash/tAdvancedHash_java.xml

@@ -46,43 +46,12 @@
 
    <CODEGENERATION>
     <IMPORTS>
-      <IMPORT
-        NAME="Advanced_Persistent_Lookup"
-        MODULE="advancedPersistentLookupLib-1.3.jar" MVN="mvn:org.talend.libraries/advancedPersistentLookupLib-1.3/6.0.0" 
-        UrlPath="platform:/plugin/org.talend.libraries.persist.lookup/lib/advancedPersistentLookupLib-1.3.jar" 
-        REQUIRED="true"
-      />
-      <IMPORT
-        NAME="ApacheCommonsCollection32"
-        MODULE="commons-collections-3.2.2.jar" MVN="mvn:commons-collections/commons-collections/3.2.2"  UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-collections-3.2.2.jar"
-        REQUIRED="true"
-        BundleID=""
-      />
-      <IMPORT
-                NAME="Jboss_Marshalling"
-                MODULE="jboss-marshalling-2.0.12.Final.jar"
-                MVN="mvn:org.jboss.marshalling/jboss-marshalling/2.0.12.Final"
-                UrlPath="platform:/plugin/org.talend.libraries.jboss.jars/lib/jboss-marshalling-2.0.12.Final.jar"
-                REQUIRED="true"
-      />
-      <IMPORT
-                NAME="Jboss_River"
-                MODULE="jboss-marshalling-river-2.0.12.Final.jar"
-                MVN="mvn:org.jboss.marshalling/jboss-marshalling-river/2.0.12.Final"
-                UrlPath="platform:/plugin/org.talend.libraries.jboss.jars/lib/jboss-marshalling-river-2.0.12.Final.jar"
-                REQUIRED="true"
-      />
-      <IMPORT
-        NAME="Trove"
-        MODULE="trove.jar" MVN="mvn:org.talend.libraries/trove/6.0.0" 
-        REQUIRED="true"
-      />
-      <IMPORT
-        NAME="Log4j"
-        MODULE="log4j-1.2.17.jar" MVN="mvn:log4j/log4j/1.2.17"  UrlPath="platform:/plugin/org.talend.libraries.apache/lib/log4j-1.2.17.jar"
-        REQUIRED="true"
-        BundleID=""
-      />
+        <IMPORT NAME="Advanced_Persistent_Lookup" MODULE="advancedPersistentLookupLib-1.4.jar" MVN="mvn:org.talend.libraries/advancedPersistentLookupLib-1.4/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.persist.lookup/lib/advancedPersistentLookupLib-1.4.jar" REQUIRED="true"/>
+        <IMPORT NAME="ApacheCommonsCollection32" MODULE="commons-collections-3.2.2.jar" MVN="mvn:commons-collections/commons-collections/3.2.2" UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-collections-3.2.2.jar" REQUIRED="true" BundleID=""/>
+        <IMPORT NAME="Jboss_Marshalling" MODULE="jboss-marshalling-2.0.12.Final.jar" MVN="mvn:org.jboss.marshalling/jboss-marshalling/2.0.12.Final" REQUIRED="true"/>
+        <IMPORT NAME="Jboss_River" MODULE="jboss-marshalling-river-2.0.12.Final.jar" MVN="mvn:org.jboss.marshalling/jboss-marshalling-river/2.0.12.Final" REQUIRED="true"/>
+        <IMPORT NAME="Trove" MODULE="trove.jar" MVN="mvn:org.talend.libraries/trove/6.0.0" REQUIRED="true"/>
+        <IMPORT NAME="Log4j" MODULE="log4j-1.2.17.jar" MVN="mvn:log4j/log4j/1.2.17" UrlPath="platform:/plugin/org.talend.libraries.apache/lib/log4j-1.2.17.jar" REQUIRED="true" BundleID=""/>
     </IMPORTS>
   </CODEGENERATION>
 

main/plugins/org.talend.designer.components.localprovider/components/tAdvancedXMLMapHash/tAdvancedXMLMapHash_java.xml

@@ -47,8 +47,8 @@
     <IMPORTS>
       <IMPORT
         NAME="Advanced_Persistent_Lookup"
-        MODULE="advancedPersistentLookupLib-1.3.jar" MVN="mvn:org.talend.libraries/advancedPersistentLookupLib-1.3/6.0.0" 
-        UrlPath="platform:/plugin/org.talend.libraries.persist.lookup/lib/advancedPersistentLookupLib-1.3.jar" 
+        MODULE="advancedPersistentLookupLib-1.4.jar" MVN="mvn:org.talend.libraries/advancedPersistentLookupLib-1.4/6.0.0" 
+        UrlPath="platform:/plugin/org.talend.libraries.persist.lookup/lib/advancedPersistentLookupLib-1.4.jar" 
         REQUIRED="true"
       />
       <IMPORT

main/plugins/org.talend.designer.components.localprovider/components/tAmazonAuroraConnection/tAmazonAuroraConnection_java.xml

@@ -215,8 +215,8 @@
     </TEMPLATES>
      <IMPORTS>
        <IMPORT NAME="Driver-MysqlConnector" MODULE="mysql-connector-java-5.1.49.jar" MVN="mvn:mysql/mysql-connector-java/5.1.49" />
-       <IMPORT NAME="slf4j-api-1.7.25.jar" MODULE="slf4j-api-1.7.25.jar" MVN="mvn:org.slf4j/slf4j-api/1.7.25" REQUIRED_IF="(USE_SHARED_CONNECTION == 'true' AND SPECIFY_DATASOURCE_ALIAS=='false')" />
-       <IMPORT NAME="slf4j-log4j12-1.7.25.jar" MODULE="slf4j-log4j12-1.7.25.jar" MVN="mvn:org.slf4j/slf4j-log4j12/1.7.25" REQUIRED_IF="(USE_SHARED_CONNECTION == 'true' AND SPECIFY_DATASOURCE_ALIAS=='false')" />
+       <IMPORT NAME="slf4j-api-1.7.29.jar" MODULE="slf4j-api-1.7.29.jar" MVN="mvn:org.slf4j/slf4j-api/1.7.29" REQUIRED_IF="(USE_SHARED_CONNECTION == 'true' AND SPECIFY_DATASOURCE_ALIAS=='false')" />
+       <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')" />
      </IMPORTS>
     </CODEGENERATION>
    <RETURNS/>

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

@@ -65,7 +65,7 @@ USER.NAME=\u30E6\u30FC\u30B6\u30FC\u540D
 USE_EXISTING_CONNECTION.NAME=\u65E2\u5B58\u306E\u63A5\u7D9A\u3092\u4F7F\u7528
 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\u306E\u4F7F\u7528
+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=\u66F4\u65B0\u306E\u5165\u529B
 FIELD_OPTIONS.ITEM.DELETE_KEY=\u524A\u9664\u306E\u5165\u529B

main/plugins/org.talend.designer.components.localprovider/components/tAmazonAuroraRow/tAmazonAuroraRow_messages_ja.properties

@@ -26,7 +26,7 @@ USER.NAME=\u30E6\u30FC\u30B6\u30FC\u540D
 USE_EXISTING_CONNECTION.NAME=\u65E2\u5B58\u306E\u63A5\u7D9A\u3092\u4F7F\u7528
 PROPERTIES.NAME=\u8FFD\u52A0\u306EJDBC\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC
 PROPAGATE_RECORD_SET.NAME=QUERY\u306E\u30EC\u30B3\u30FC\u30C9\u30BB\u30C3\u30C8\u3092\u4F1D\u64AD
-RECORD_SET_COLUMN.NAME=\u30AB\u30E9\u30E0\u306E\u4F7F\u7528
+RECORD_SET_COLUMN.NAME=\u30AB\u30E9\u30E0\u3092\u4F7F\u7528
 TABLE.NAME=\u30C6\u30FC\u30D6\u30EB\u540D
 PROPERTY.NAME=\u30D7\u30ED\u30D1\u30C6\u30A3\u30BF\u30A4\u30D7
 CONNECTION.NAME=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u30EA\u30B9\u30C8
@@ -37,7 +37,7 @@ QUERYSTORE.NAME=\u30AF\u30A8\u30EA\u30FC\u30BF\u30A4\u30D7
 DB_VERSION.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30D0\u30FC\u30B8\u30E7\u30F3
 DB_VERSION.ITEM.MYSQL_5=Mysql 5
 
-USE_PREPAREDSTATEMENT.NAME=PreparedStatement\u3092\u4F7F\u3046
+USE_PREPAREDSTATEMENT.NAME=PreparedStatement\u3092\u4F7F\u7528
 SET_PREPAREDSTATEMENT_PARAMETERS.NAME=PreparedStatement\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u306E\u8A2D\u5B9A
 SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_INDEX=\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u306E\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9
 SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE=\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u30BF\u30A4\u30D7

main/plugins/org.talend.designer.components.localprovider/components/tAmazonMysqlConnection/tAmazonMysqlConnection_java.xml

@@ -164,8 +164,8 @@
      <IMPORTS>
        <IMPORT NAME="Driver-MysqlConnector" MODULE="mysql-connector-java-5.1.49.jar" MVN="mvn:mysql/mysql-connector-java/5.1.49"  REQUIRED_IF="DB_VERSION == 'MYSQL_5'" />
        <IMPORT NAME="Driver-MysqlConnector_Old" MODULE="mysql-connector-java-5.1.0-bin.jar" MVN="mvn:org.talend.libraries/mysql-connector-java-5.1.0-bin/6.0.0"  REQUIRED="false" />
-       <IMPORT NAME="slf4j-api-1.7.25.jar" MODULE="slf4j-api-1.7.25.jar" MVN="mvn:org.slf4j/slf4j-api/1.7.25" REQUIRED_IF="USE_SHARED_CONNECTION =='true'" />
-       <IMPORT NAME="slf4j-log4j12-1.7.25.jar" MODULE="slf4j-log4j12-1.7.25.jar" MVN="mvn:org.slf4j/slf4j-log4j12/1.7.25" REQUIRED_IF="USE_SHARED_CONNECTION =='true'" />
+       <IMPORT NAME="slf4j-api-1.7.29.jar" MODULE="slf4j-api-1.7.29.jar" MVN="mvn:org.slf4j/slf4j-api/1.7.29" REQUIRED_IF="USE_SHARED_CONNECTION =='true'" />
+       <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'" />
      </IMPORTS>
     </CODEGENERATION>
    <RETURNS/>

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

@@ -72,7 +72,7 @@ USER.NAME=\u30E6\u30FC\u30B6\u30FC\u540D
 USE_EXISTING_CONNECTION.NAME=\u65E2\u5B58\u306E\u63A5\u7D9A\u3092\u4F7F\u7528
 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\u306E\u4F7F\u7528
+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=\u66F4\u65B0\u306E\u5165\u529B
 FIELD_OPTIONS.ITEM.DELETE_KEY=\u524A\u9664\u306E\u5165\u529B

main/plugins/org.talend.designer.components.localprovider/components/tAmazonMysqlRow/tAmazonMysqlRow_messages_ja.properties

@@ -30,7 +30,7 @@ USER.NAME=\u30E6\u30FC\u30B6\u30FC\u540D
 USE_EXISTING_CONNECTION.NAME=\u65E2\u5B58\u306E\u63A5\u7D9A\u3092\u4F7F\u7528
 PROPERTIES.NAME=\u8FFD\u52A0\u306EJDBC\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC
 PROPAGATE_RECORD_SET.NAME=QUERY\u306E\u30EC\u30B3\u30FC\u30C9\u30BB\u30C3\u30C8\u3092\u4F1D\u64AD
-RECORD_SET_COLUMN.NAME=\u30AB\u30E9\u30E0\u306E\u4F7F\u7528
+RECORD_SET_COLUMN.NAME=\u30AB\u30E9\u30E0\u3092\u4F7F\u7528
 TABLE.NAME=\u30C6\u30FC\u30D6\u30EB\u540D
 PROPERTY.NAME=\u30D7\u30ED\u30D1\u30C6\u30A3\u30BF\u30A4\u30D7
 CONNECTION.NAME=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u30EA\u30B9\u30C8
@@ -39,7 +39,7 @@ SCHEMA_REJECT.NAME=\u30B9\u30AD\u30FC\u30DE\u306E\u30EA\u30B8\u30A7\u30AF\u30C8
 QUERYSTORE.NAME=\u30AF\u30A8\u30EA\u30FC\u30BF\u30A4\u30D7
 DB_VERSION.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30D0\u30FC\u30B8\u30E7\u30F3
 DB_VERSION.ITEM.MYSQL_5=Mysql 5
-USE_PREPAREDSTATEMENT.NAME=PreparedStatement\u3092\u4F7F\u3046
+USE_PREPAREDSTATEMENT.NAME=PreparedStatement\u3092\u4F7F\u7528
 SET_PREPAREDSTATEMENT_PARAMETERS.NAME=PreparedStatement\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u306E\u8A2D\u5B9A
 SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_INDEX=\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u306E\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9
 SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE=\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u30BF\u30A4\u30D7

main/plugins/org.talend.designer.components.localprovider/components/tAmazonOracleConnection/tAmazonOracleConnection_java.xml

@@ -243,8 +243,8 @@
        <IMPORT NAME="ORACLE_18"     MODULE="ojdbc8-19.3.0.0.jar" MVN="mvn:com.oracle.ojdbc/ojdbc8/19.3.0.0" REQUIRED_IF="(DB_VERSION == 'ORACLE_18')" />
        <IMPORT NAME="Driver-Ojdbc7" MODULE="ojdbc7.jar" MVN="mvn:org.talend.libraries/ojdbc7/6.0.0"  REQUIRED_IF="(DB_VERSION == 'ORACLE_12')" />
        <IMPORT NAME="Driver-Ojdbc6" MODULE="ojdbc6.jar" MVN="mvn:org.talend.libraries/ojdbc6/6.0.0"  REQUIRED_IF="(DB_VERSION == 'ORACLE_11')" />
-       <IMPORT NAME="slf4j-api-1.7.25.jar" MODULE="slf4j-api-1.7.25.jar" MVN="mvn:org.slf4j/slf4j-api/1.7.25" REQUIRED_IF="USE_SHARED_CONNECTION =='true'" />
-       <IMPORT NAME="slf4j-log4j12-1.7.25.jar" MODULE="slf4j-log4j12-1.7.25.jar" MVN="mvn:org.slf4j/slf4j-log4j12/1.7.25" REQUIRED_IF="USE_SHARED_CONNECTION =='true'" />
+       <IMPORT NAME="slf4j-api-1.7.29.jar" MODULE="slf4j-api-1.7.29.jar" MVN="mvn:org.slf4j/slf4j-api/1.7.29" REQUIRED_IF="USE_SHARED_CONNECTION =='true'" />
+       <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'" />
     </IMPORTS>
    </CODEGENERATION>
 

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

@@ -67,7 +67,7 @@ JDBC_URL.NAME=URL
 USE_EXISTING_CONNECTION.NAME=\u65E2\u5B58\u306E\u63A5\u7D9A\u3092\u4F7F\u7528
 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\u306E\u4F7F\u7528
+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=\u66F4\u65B0\u306E\u5165\u529B
 FIELD_OPTIONS.ITEM.DELETE_KEY=\u524A\u9664\u306E\u5165\u529B

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

@@ -19,7 +19,7 @@ PORT.NAME=\u30DD\u30FC\u30C8
 PREPARED_STATEMENT.NAME=\u6E96\u5099\u3055\u308C\u305F\u30B9\u30C6\u30FC\u30C8\u30E1\u30F3\u30C8
 PROPAGATE_RECORD_SET.NAME=QUERY\u306E\u30EC\u30B3\u30FC\u30C9\u30BB\u30C3\u30C8\u3092\u4F1D\u64AD
 QUERY.NAME=\u30AF\u30A8\u30EA\u30FC
-RECORD_SET_COLUMN.NAME=\u30AB\u30E9\u30E0\u306E\u4F7F\u7528
+RECORD_SET_COLUMN.NAME=\u30AB\u30E9\u30E0\u3092\u4F7F\u7528
 REJECT.LINK=\u30EA\u30B8\u30A7\u30AF\u30C8
 REJECT.MENU=\u30EA\u30B8\u30A7\u30AF\u30C8
 SCHEMA_DB.NAME=\u30B9\u30AD\u30FC\u30DE
@@ -44,7 +44,7 @@ CONNECTION.NAME=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u30EA\u30B9\u30C8
 SCHEMA_FLOW.NAME=\u30B9\u30AD\u30FC\u30DE
 SCHEMA_REJECT.NAME=\u30B9\u30AD\u30FC\u30DE\u306E\u30EA\u30B8\u30A7\u30AF\u30C8
 QUERYSTORE.NAME=\u30AF\u30A8\u30EA\u30FC\u30BF\u30A4\u30D7
-USE_PREPAREDSTATEMENT.NAME=PreparedStatement\u3092\u4F7F\u3046
+USE_PREPAREDSTATEMENT.NAME=PreparedStatement\u3092\u4F7F\u7528
 SET_PREPAREDSTATEMENT_PARAMETERS.NAME=PreparedStatement\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u306E\u8A2D\u5B9A
 SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_INDEX=\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u306E\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9
 SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE=\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u30BF\u30A4\u30D7

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

@@ -381,11 +381,12 @@
 	<CODEGENERATION>
 		<IMPORTS>
 			<IMPORT NAME="Driver-mssql-jdbc" MODULE="mssql-jdbc.jar" MVN="mvn:org.talend.libraries/mssql-jdbc/6.0.0"  REQUIRED_IF="DRIVER=='MSSQL_PROP'" />
-            <IMPORT NAME="adal4j" MODULE="adal4j-1.6.5.jar" MVN="mvn:com.microsoft.azure/adal4j/1.6.5"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+            <IMPORT NAME="adal4j" MODULE="adal4j-1.6.7.jar" MVN="mvn:com.microsoft.azure/adal4j/1.6.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
             <IMPORT NAME="commons-lang3" MODULE="commons-lang3-3.10.jar" MVN="mvn:org.apache.commons/commons-lang3/3.10"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
             <IMPORT NAME="commons-codec" MODULE="commons-codec-1.14.jar" MVN="mvn:commons-codec/commons-codec/1.14"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
             <IMPORT NAME="gson" MODULE="gson-2.8.6.jar" MVN="mvn:com.google.code.gson/gson/2.8.6"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
-            <IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-6.5.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/6.5"  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="content-type" MODULE="content-type-2.1.jar" MVN="mvn:com.nimbusds/content-type/2.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')" />
             <IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-8.11.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/8.11"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
             <IMPORT NAME="javax.mail" MODULE="javax.mail-1.6.2.jar" MVN="mvn:com.sun.mail/javax.mail/1.6.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />

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

@@ -1,10 +1,10 @@
 ACCOUNT_NAME.NAME=\u30A2\u30AB\u30A6\u30F3\u30C8\u540D
-AZURE_CONNECTION.NAME=Azure\u30B9\u30C8\u30EC\u30FC\u30B8\u63A5\u7D9A
-AZURE_LOCATION.NAME=Azure\u30B9\u30C8\u30EC\u30FC\u30B8\u30ED\u30B1\u30FC\u30B7\u30E7\u30F3
+AZURE_CONNECTION.NAME=Azure Storage\u63A5\u7D9A
+AZURE_LOCATION.NAME=Azure Storage\u30ED\u30B1\u30FC\u30B7\u30E7\u30F3
 AZURE_STORAGE.ITEM.ADLS=Data Lake Storage Gen1
 AZURE_STORAGE.ITEM.ADLS_GEN2=Azure Data Lake Storage (Gen2)
 AZURE_STORAGE.ITEM.BLOB=Blob\u30B9\u30C8\u30EC\u30FC\u30B8
-AZURE_STORAGE.NAME=Azure\u30B9\u30C8\u30EC\u30FC\u30B8
+AZURE_STORAGE.NAME=Azure Storage
 CLIENT_ID.NAME=\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8ID
 COMPRESS.NAME=\u5727\u7E2E\u65B9\u5F0F
 COMPRESSION_ORC.ITEM.DEFAULT=\u30C7\u30D5\u30A9\u30EB\u30C8
@@ -138,4 +138,4 @@ ENCODING.ITEM.UTF8=UTF8
 ENCODING.ITEM.UTF16=UTF16
 IDENTITY_INSERT.NAME=ID\u633F\u5165
 MAX_ERRORS.NAME=\u6700\u5927\u30A8\u30E9\u30FC\u6570
-ERROR_FILE.NAME=\u30A8\u30E9\u30FC\u30D5\u30A1\u30A4\u30EB\u306E\u5834\u6240
+ERROR_FILE.NAME=\u30A8\u30E9\u30FC\u30D5\u30A1\u30A4\u30EB\u306E\u30ED\u30B1\u30FC\u30B7\u30E7\u30F3

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

@@ -202,13 +202,14 @@
    <CODEGENERATION>
      <IMPORTS>
      	<IMPORT NAME="Driver-mssql-jdbc" MODULE="mssql-jdbc.jar" MVN="mvn:org.talend.libraries/mssql-jdbc/6.0.0"  REQUIRED_IF="DRIVER=='MSSQL_PROP'" />
-     	<IMPORT NAME="slf4j-api-1.7.25.jar" MODULE="slf4j-api-1.7.25.jar" MVN="mvn:org.slf4j/slf4j-api/1.7.25" REQUIRED_IF="(USE_SHARED_CONNECTION == 'true' AND SPECIFY_DATASOURCE_ALIAS=='false')" />
-     	<IMPORT NAME="slf4j-log4j12-1.7.25.jar" MODULE="slf4j-log4j12-1.7.25.jar" MVN="mvn:org.slf4j/slf4j-log4j12/1.7.25" REQUIRED_IF="(USE_SHARED_CONNECTION == 'true' AND SPECIFY_DATASOURCE_ALIAS=='false')" />
-        <IMPORT NAME="adal4j" MODULE="adal4j-1.6.5.jar" MVN="mvn:com.microsoft.azure/adal4j/1.6.5"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
+     	<IMPORT NAME="slf4j-api-1.7.29.jar" MODULE="slf4j-api-1.7.29.jar" MVN="mvn:org.slf4j/slf4j-api/1.7.29" REQUIRED_IF="(USE_SHARED_CONNECTION == 'true' AND SPECIFY_DATASOURCE_ALIAS=='false')" />
+     	<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')" />
+        <IMPORT NAME="adal4j" MODULE="adal4j-1.6.7.jar" MVN="mvn:com.microsoft.azure/adal4j/1.6.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
         <IMPORT NAME="commons-lang3" MODULE="commons-lang3-3.10.jar" MVN="mvn:org.apache.commons/commons-lang3/3.10"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
         <IMPORT NAME="commons-codec" MODULE="commons-codec-1.14.jar" MVN="mvn:commons-codec/commons-codec/1.14"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
         <IMPORT NAME="gson" MODULE="gson-2.8.6.jar" MVN="mvn:com.google.code.gson/gson/2.8.6"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
-        <IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-6.5.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/6.5"  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="content-type" MODULE="content-type-2.1.jar" MVN="mvn:com.nimbusds/content-type/2.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')" />
         <IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-8.11.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/8.11"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
         <IMPORT NAME="javax.mail" MODULE="javax.mail-1.6.2.jar" MVN="mvn:com.sun.mail/javax.mail/1.6.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />

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

@@ -264,11 +264,12 @@
      <IMPORTS>
         <IMPORT NAME="Driver-mssql-jdbc" MODULE="mssql-jdbc.jar" MVN="mvn:org.talend.libraries/mssql-jdbc/6.0.0"  REQUIRED_IF="(DRIVER == 'MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
         <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" />
-        <IMPORT NAME="adal4j" MODULE="adal4j-1.6.5.jar" MVN="mvn:com.microsoft.azure/adal4j/1.6.5"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="adal4j" MODULE="adal4j-1.6.7.jar" MVN="mvn:com.microsoft.azure/adal4j/1.6.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="commons-lang3" MODULE="commons-lang3-3.10.jar" MVN="mvn:org.apache.commons/commons-lang3/3.10"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="commons-codec" MODULE="commons-codec-1.14.jar" MVN="mvn:commons-codec/commons-codec/1.14"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="gson" MODULE="gson-2.8.6.jar" MVN="mvn:com.google.code.gson/gson/2.8.6"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
-        <IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-6.5.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/6.5"  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="content-type" MODULE="content-type-2.1.jar" MVN="mvn:com.nimbusds/content-type/2.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')" />
         <IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-8.11.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/8.11"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="javax.mail" MODULE="javax.mail-1.6.2.jar" MVN="mvn:com.sun.mail/javax.mail/1.6.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />

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

@@ -335,11 +335,12 @@
 	<CODEGENERATION>
 		<IMPORTS>
 			<IMPORT NAME="Driver-mssql-jdbc" MODULE="mssql-jdbc.jar" MVN="mvn:org.talend.libraries/mssql-jdbc/6.0.0"  REQUIRED_IF="(DRIVER == 'MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
-            <IMPORT NAME="adal4j" MODULE="adal4j-1.6.5.jar" MVN="mvn:com.microsoft.azure/adal4j/1.6.5"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+            <IMPORT NAME="adal4j" MODULE="adal4j-1.6.7.jar" MVN="mvn:com.microsoft.azure/adal4j/1.6.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
             <IMPORT NAME="commons-lang3" MODULE="commons-lang3-3.10.jar" MVN="mvn:org.apache.commons/commons-lang3/3.10"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
             <IMPORT NAME="commons-codec" MODULE="commons-codec-1.14.jar" MVN="mvn:commons-codec/commons-codec/1.14"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
             <IMPORT NAME="gson" MODULE="gson-2.8.6.jar" MVN="mvn:com.google.code.gson/gson/2.8.6"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
-            <IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-6.5.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/6.5"  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="content-type" MODULE="content-type-2.1.jar" MVN="mvn:com.nimbusds/content-type/2.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')" />
             <IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-8.11.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/8.11"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
             <IMPORT NAME="javax.mail" MODULE="javax.mail-1.6.2.jar" MVN="mvn:com.sun.mail/javax.mail/1.6.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />

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

@@ -69,7 +69,7 @@ TABLE_ACTION.ITEM.NONE=\u306A\u3057
 TABLE_ACTION.NAME=\u30C6\u30FC\u30D6\u30EB\u306E\u64CD\u4F5C
 USER.NAME=\u30E6\u30FC\u30B6\u30FC\u540D
 USE_EXISTING_CONNECTION.NAME=\u65E2\u5B58\u306E\u63A5\u7D9A\u3092\u4F7F\u7528
-USE_FIELD_OPTIONS.NAME=\u30D5\u30A3\u30FC\u30EB\u30C9\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u4F7F\u7528
+USE_FIELD_OPTIONS.NAME=\u30D5\u30A3\u30FC\u30EB\u30C9\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4F7F\u7528
 ENABLE_DEBUG_MODE.NAME=\u30C7\u30D0\u30C3\u30B0\u30AF\u30A8\u30EA\u30FC\u30E2\u30FC\u30C9
 SPECIFY_IDENTITY_FIELD.NAME=ID\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u6307\u5B9A
 IDENTITY_FIELD.NAME=ID\u30D5\u30A3\u30FC\u30EB\u30C9

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

@@ -320,11 +320,12 @@
   <CODEGENERATION>
     <IMPORTS>
         <IMPORT NAME="Driver-mssql-jdbc" MODULE="mssql-jdbc.jar" MVN="mvn:org.talend.libraries/mssql-jdbc/6.0.0"  REQUIRED_IF="(DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
-        <IMPORT NAME="adal4j" MODULE="adal4j-1.6.5.jar" MVN="mvn:com.microsoft.azure/adal4j/1.6.5"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="adal4j" MODULE="adal4j-1.6.7.jar" MVN="mvn:com.microsoft.azure/adal4j/1.6.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="commons-lang3" MODULE="commons-lang3-3.10.jar" MVN="mvn:org.apache.commons/commons-lang3/3.10"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="commons-codec" MODULE="commons-codec-1.14.jar" MVN="mvn:commons-codec/commons-codec/1.14"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="gson" MODULE="gson-2.8.6.jar" MVN="mvn:com.google.code.gson/gson/2.8.6"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
-        <IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-6.5.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/6.5"  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="content-type" MODULE="content-type-2.1.jar" MVN="mvn:com.nimbusds/content-type/2.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')" />
         <IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-8.11.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/8.11"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="javax.mail" MODULE="javax.mail-1.6.2.jar" MVN="mvn:com.sun.mail/javax.mail/1.6.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />

main/plugins/org.talend.designer.components.localprovider/components/tAzureSynapseRow/tAzureSynapseRow_messages_ja.properties

@@ -22,7 +22,7 @@ SCHEMA_DB.NAME=\u30B9\u30AD\u30FC\u30DE
 USER.NAME=\u30E6\u30FC\u30B6\u30FC\u540D
 USE_EXISTING_CONNECTION.NAME=\u65E2\u5B58\u306E\u63A5\u7D9A\u3092\u4F7F\u7528
 PROPAGATE_RECORD_SET.NAME=QUERY\u306E\u30EC\u30B3\u30FC\u30C9\u30BB\u30C3\u30C8\u3092\u4F1D\u64AD
-RECORD_SET_COLUMN.NAME=\u30AB\u30E9\u30E0\u306E\u4F7F\u7528
+RECORD_SET_COLUMN.NAME=\u30AB\u30E9\u30E0\u3092\u4F7F\u7528
 TABLE.NAME=\u30C6\u30FC\u30D6\u30EB\u540D
 TYPE.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30C9\u30E9\u30A4\u30D0\u30FC
 PROPERTY.NAME=\u30D7\u30ED\u30D1\u30C6\u30A3\u30BF\u30A4\u30D7
@@ -30,7 +30,7 @@ CONNECTION.NAME=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u30EA\u30B9\u30C8
 SCHEMA_FLOW.NAME=\u30B9\u30AD\u30FC\u30DE
 SCHEMA_REJECT.NAME=\u30B9\u30AD\u30FC\u30DE\u306E\u30EA\u30B8\u30A7\u30AF\u30C8
 QUERYSTORE.NAME=\u30AF\u30A8\u30EA\u30FC\u30BF\u30A4\u30D7
-USE_PREPAREDSTATEMENT.NAME=PreparedStatement\u3092\u4F7F\u3046
+USE_PREPAREDSTATEMENT.NAME=PreparedStatement\u3092\u4F7F\u7528
 SET_PREPAREDSTATEMENT_PARAMETERS.NAME=PreparedStatement\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u306E\u8A2D\u5B9A
 SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_INDEX=\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u306E\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9
 SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE=\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u30BF\u30A4\u30D7

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

@@ -165,32 +165,11 @@
       SHOW_IF="(BULK_FILE_ALREADY_EXIST=='false')"
       >
       <ITEMS DEFAULT="GS_SERVICE_ACCOUNT">
-        <ITEM NAME="USER_ACCOUNT_HMAC" VALUE="USER_ACCOUNT_HMAC"/>
         <ITEM NAME="GS_SERVICE_ACCOUNT" VALUE="GS_SERVICE_ACCOUNT"/>
         <ITEM NAME="TOKEN" VALUE="TOKEN" />
       </ITEMS>
     </PARAMETER>
 
-    <PARAMETER 
-      NAME="GS_ACCESS_KEY" 
-      FIELD="TEXT" 
-      NUM_ROW="60" 
-      REQUIRED="true" 
-      GROUP="GS_CONF" 
-      SHOW_IF="(BULK_FILE_ALREADY_EXIST=='false') AND (AUTH_TYPE == 'USER_ACCOUNT_HMAC')">
-      <DEFAULT>""</DEFAULT>
-    </PARAMETER>
-
-    <PARAMETER 
-      NAME="GS_SECRET_KEY" 
-      FIELD="PASSWORD" 
-      NUM_ROW="61" 
-      REQUIRED="true" 
-      GROUP="GS_CONF" 
-      SHOW_IF="(BULK_FILE_ALREADY_EXIST=='false') AND (AUTH_TYPE == 'USER_ACCOUNT_HMAC')">
-      <DEFAULT>""</DEFAULT>
-    </PARAMETER>
-
     <PARAMETER
       NAME="GS_SERVICE_ACCOUNT_KEY"
       FIELD="FILE"
@@ -315,7 +294,7 @@
       <IMPORT NAME="google-api-services-storage-v1-rev20201112-1.31.0" MODULE="google-api-services-storage-v1-rev20201112-1.31.0.jar" MVN="mvn:com.google.apis/google-api-services-storage/v1-rev20201112-1.31.0" REQUIRED_IF="(AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN')" />
       <IMPORT NAME="gson-2.8.6" MODULE="gson-2.8.6.jar" MVN="mvn:com.google.code.gson/gson/2.8.6" REQUIRED="true" />
       <IMPORT NAME="javax.annotation-api" MODULE="javax.annotation-api-1.3.jar" MVN="mvn:javax.annotation/javax.annotation-api/1.3" REQUIRED_IF="(AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN')" />
-      <IMPORT NAME="protobuf-java-2.5.0" MODULE="protobuf-java-2.5.0.jar" MVN="mvn:com.google.protobuf/protobuf-java/2.5.0" REQUIRED_IF="(AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN')" />
+      <IMPORT NAME="protobuf-java-3.4.0" MODULE="protobuf-java-3.4.0.jar" MVN="mvn:com.google.protobuf/protobuf-java/3.4.0" REQUIRED_IF="(AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN')" />
       <IMPORT NAME="error_prone_annotation-2.1.3" MODULE="error_prone_annotation-2.1.3.jar" MVN="mvn:com.google.errorprone/error_prone_annotations/2.1.3" REQUIRED_IF="(AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN')" />
       <IMPORT NAME="opencensus-api-0.24.0" MODULE="opencensus-api-0.24.0.jar" MVN="mvn:io.opencensus/opencensus-api/0.24.0" REQUIRED="true" />
       <IMPORT NAME="opencensus-contrib-http-util-0.24.0" MODULE="opencensus-contrib-http-util-0.24.0.jar" MVN="mvn:io.opencensus/opencensus-contrib-http-util/0.24.0" REQUIRED="true" />

main/plugins/org.talend.designer.components.localprovider/components/tBigQueryBulkExec/tBigQueryBulkExec_messages.properties

@@ -36,7 +36,6 @@ CUSTOM_NULL_MARKER.NAME=
 DROP.NAME=Drop table if exists
 DIE_ON_ERROR.NAME=Die on error
 AUTH_TYPE.NAME=Credential type
-AUTH_TYPE.ITEM.USER_ACCOUNT_HMAC=HMAC key (deprecated)
 AUTH_TYPE.ITEM.GS_SERVICE_ACCOUNT=Service account
 GS_SERVICE_ACCOUNT_KEY.NAME=Service account key
 GS_ACCESS_TOKEN.NAME=OAuth Access Token

main/plugins/org.talend.designer.components.localprovider/components/tBigQueryBulkExec/tBigQueryBulkExec_messages_fr.properties

@@ -36,7 +36,6 @@ CUSTOM_NULL_MARKER.NAME=
 DROP.NAME=Supprimer la table si elle existe
 DIE_ON_ERROR.NAME=Arr\u00EAter en cas d'erreur
 AUTH_TYPE.NAME=Type d'identifiant
-AUTH_TYPE.ITEM.USER_ACCOUNT_HMAC=Cl\u00E9 HMAC (d\u00E9pr\u00E9ci\u00E9e)
 AUTH_TYPE.ITEM.GS_SERVICE_ACCOUNT=Compte de service
 GS_SERVICE_ACCOUNT_KEY.NAME=Cl\u00E9 du compte de service
 GS_ACCESS_TOKEN.NAME=Jeton d'acc\u00E8s OAuth

main/plugins/org.talend.designer.components.localprovider/components/tBigQueryBulkExec/tBigQueryBulkExec_messages_ja.properties

@@ -36,7 +36,6 @@ CUSTOM_NULL_MARKER.NAME=
 DROP.NAME=\u5B58\u5728\u3059\u308B\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u30C9\u30ED\u30C3\u30D7
 DIE_ON_ERROR.NAME=\u30A8\u30E9\u30FC\u767A\u751F\u6642\u306B\u5F37\u5236\u7D42\u4E86
 AUTH_TYPE.NAME=\u8A8D\u8A3C\u60C5\u5831\u306E\u30BF\u30A4\u30D7
-AUTH_TYPE.ITEM.USER_ACCOUNT_HMAC=HMAC\u30AD\u30FC(\u975E\u63A8\u5968)
 AUTH_TYPE.ITEM.GS_SERVICE_ACCOUNT=\u30B5\u30FC\u30D3\u30B9\u30A2\u30AB\u30A6\u30F3\u30C8
 GS_SERVICE_ACCOUNT_KEY.NAME=\u30B5\u30FC\u30D3\u30B9\u30A2\u30AB\u30A6\u30F3\u30C8\u30AD\u30FC
 GS_ACCESS_TOKEN.NAME=OAuth\u30A2\u30AF\u30BB\u30B9\u30C8\u30FC\u30AF\u30F3

main/plugins/org.talend.designer.components.localprovider/components/tBigQueryBulkExec/tBigQueryBulkExec_messages_zh_CN.properties

@@ -36,7 +36,6 @@ CUSTOM_NULL_MARKER.NAME=
 DROP.NAME=\u5982\u679C\u8868\u5B58\u5728\u5219\u5220\u9664
 DIE_ON_ERROR.NAME=\u9519\u8BEF\u65F6\u7EC8\u6B62
 AUTH_TYPE.NAME=\u7528\u6237\u540D\u548C\u5BC6\u7801\u7C7B\u578B
-AUTH_TYPE.ITEM.USER_ACCOUNT_HMAC=HMAC \u5BC6\u94A5 (\u5DF2\u5F03\u7528)
 AUTH_TYPE.ITEM.GS_SERVICE_ACCOUNT=\u670D\u52A1\u5E10\u6237
 GS_SERVICE_ACCOUNT_KEY.NAME=\u670D\u52A1\u5E10\u6237\u5BC6\u94A5
 GS_ACCESS_TOKEN.NAME=OAuth \u8BBF\u95EE\u4EE4\u724C

main/plugins/org.talend.designer.components.localprovider/components/tBigQueryInput/BigQueryInputQueryHelper.javajet

@@ -257,7 +257,9 @@ class BigQueryUtil_<%=cid%> {
             <%
                 }
             %>
-            jobList.add(job);
+            if (job.getStatistics().getScriptStatistics() == null || !"EXPRESSION".equals(job.getStatistics().getScriptStatistics().getEvaluationKind())){
+                jobList.add(job);
+            }
             statistics_<%=cid %>.add(job.getStatistics().toString());
         }
         java.util.Collections.reverse(jobList);

main/plugins/org.talend.designer.components.localprovider/components/tBigQueryInput/tBigQueryInput_begin.javajet

@@ -339,8 +339,11 @@ globalMap.put("<%=cid%>_ERROR_MESSAGE",ee_<%=cid%>.getMessage());
                         %>
                         continue;
                     }
-
+                    if (job_iterable_<%=cid%>.getStatistics().getScriptStatistics() != null && "EXPRESSION".equals(job_iterable_<%=cid%>.getStatistics().getScriptStatistics().getEvaluationKind())){
+                        continue;
+                    }
                     com.google.cloud.bigquery.TableResult result_<%=cid%> = job_iterable_<%=cid%>.getQueryResults();
+
 		//Dynamic start
 
 		<%

main/plugins/org.talend.designer.components.localprovider/components/tBigQueryOutput/tBigQueryOutput_java.xml

@@ -183,32 +183,11 @@
       GROUP="GS_CONF"
       SHOW_IF="(BULK_FILE_ALREADY_EXIST=='false')">
       <ITEMS DEFAULT="GS_SERVICE_ACCOUNT">
-        <ITEM NAME="USER_ACCOUNT_HMAC" VALUE="USER_ACCOUNT_HMAC"/>
         <ITEM NAME="GS_SERVICE_ACCOUNT" VALUE="GS_SERVICE_ACCOUNT"/>
         <ITEM NAME="TOKEN" VALUE="TOKEN" />
       </ITEMS>
     </PARAMETER>
 
-    <PARAMETER
-      NAME="GS_ACCESS_KEY"
-      FIELD="TEXT"
-      NUM_ROW="60"
-      REQUIRED="true"
-      GROUP="GS_CONF"
-      SHOW_IF="(BULK_FILE_ALREADY_EXIST=='false') AND (AUTH_TYPE == 'USER_ACCOUNT_HMAC')">
-      <DEFAULT>""</DEFAULT>
-    </PARAMETER>
-
-    <PARAMETER
-      NAME="GS_SECRET_KEY"
-      FIELD="PASSWORD"
-      NUM_ROW="61"
-      REQUIRED="true"
-      GROUP="GS_CONF"
-      SHOW_IF="(BULK_FILE_ALREADY_EXIST=='false') AND (AUTH_TYPE == 'USER_ACCOUNT_HMAC')">
-      <DEFAULT>""</DEFAULT>
-    </PARAMETER>
-
     <PARAMETER
       NAME="GS_SERVICE_ACCOUNT_KEY"
       FIELD="FILE"
@@ -366,8 +345,6 @@
       <TEMPLATE_PARAM SOURCE="self.GS_SERVICE_ACCOUNT_KEY"  TARGET="tBQBE.GS_SERVICE_ACCOUNT_KEY" />
       <TEMPLATE_PARAM SOURCE="self.GS_ACCESS_TOKEN"  TARGET="tBQBE.GS_ACCESS_TOKEN" />
       <TEMPLATE_PARAM SOURCE="self.GS_ACCESS_TOKEN_WARNING"  TARGET="tBQBE.GS_ACCESS_TOKEN_WARNING" />
-      <TEMPLATE_PARAM SOURCE="self.GS_ACCESS_KEY"  TARGET="tBQBE.GS_ACCESS_KEY" />
-      <TEMPLATE_PARAM SOURCE="self.GS_SECRET_KEY"  TARGET="tBQBE.GS_SECRET_KEY" />
       <TEMPLATE_PARAM SOURCE="self.BUCKET_NAME"  TARGET="tBQBE.BUCKET_NAME" />
       <TEMPLATE_PARAM SOURCE="self.GS_FILE"  TARGET="tBQBE.GS_FILE" />
       <TEMPLATE_PARAM SOURCE="self.GS_FILE_HEADER"  TARGET="tBQBE.GS_FILE_HEADER" />

main/plugins/org.talend.designer.components.localprovider/components/tBigQueryOutput/tBigQueryOutput_messages.properties

@@ -48,7 +48,6 @@ TOKEN_NAME.NAME=token properties File Name
 CHECK_DISK_SPACE.NAME=Check disk space
 DIE_ON_ERROR.NAME=Die on error
 AUTH_TYPE.NAME=Credential type
-AUTH_TYPE.ITEM.USER_ACCOUNT_HMAC=HMAC key (deprecated)
 AUTH_TYPE.ITEM.GS_SERVICE_ACCOUNT=Service account
 AUTH_TYPE.ITEM.TOKEN=OAuth Access Token
 GS_SERVICE_ACCOUNT_KEY.NAME=Service account key

main/plugins/org.talend.designer.components.localprovider/components/tBigQueryOutput/tBigQueryOutput_messages_fr.properties

@@ -48,7 +48,6 @@ TOKEN_NAME.NAME=Nom du fichier de propri\u00E9t\u00E9s du jeton
 CHECK_DISK_SPACE.NAME=V\u00E9rifier l'espace disque
 DIE_ON_ERROR.NAME=Arr\u00EAter en cas d'erreur
 AUTH_TYPE.NAME=Type d'identifiant
-AUTH_TYPE.ITEM.USER_ACCOUNT_HMAC=Cl\u00E9 HMAC (d\u00E9pr\u00E9ci\u00E9e)
 AUTH_TYPE.ITEM.GS_SERVICE_ACCOUNT=Compte de service
 AUTH_TYPE.ITEM.TOKEN=Jeton d'acc\u00E8s OAuth
 GS_SERVICE_ACCOUNT_KEY.NAME=Cl\u00E9 du compte de service

main/plugins/org.talend.designer.components.localprovider/components/tBigQueryOutput/tBigQueryOutput_messages_ja.properties

@@ -48,7 +48,6 @@ TOKEN_NAME.NAME=\u30C8\u30FC\u30AF\u30F3\u30D7\u30ED\u30D1\u30C6\u30A3\u30D5\u30
 CHECK_DISK_SPACE.NAME=\u30C7\u30A3\u30B9\u30AF\u5BB9\u91CF\u306E\u78BA\u8A8D
 DIE_ON_ERROR.NAME=\u30A8\u30E9\u30FC\u767A\u751F\u6642\u306B\u5F37\u5236\u7D42\u4E86
 AUTH_TYPE.NAME=\u8A8D\u8A3C\u60C5\u5831\u306E\u30BF\u30A4\u30D7
-AUTH_TYPE.ITEM.USER_ACCOUNT_HMAC=HMAC\u30AD\u30FC(\u975E\u63A8\u5968)
 AUTH_TYPE.ITEM.GS_SERVICE_ACCOUNT=\u30B5\u30FC\u30D3\u30B9\u30A2\u30AB\u30A6\u30F3\u30C8
 AUTH_TYPE.ITEM.TOKEN=OAuth\u30A2\u30AF\u30BB\u30B9\u30C8\u30FC\u30AF\u30F3
 GS_SERVICE_ACCOUNT_KEY.NAME=\u30B5\u30FC\u30D3\u30B9\u30A2\u30AB\u30A6\u30F3\u30C8\u30AD\u30FC

main/plugins/org.talend.designer.components.localprovider/components/tBigQueryOutput/tBigQueryOutput_messages_zh_CN.properties

@@ -48,7 +48,6 @@ TOKEN_NAME.NAME=\u4EE4\u724C\u5C5E\u6027\u6587\u4EF6\u540D
 CHECK_DISK_SPACE.NAME=\u68C0\u67E5\u78C1\u76D8\u7A7A\u95F4
 DIE_ON_ERROR.NAME=\u9519\u8BEF\u65F6\u7EC8\u6B62
 AUTH_TYPE.NAME=\u7528\u6237\u540D\u548C\u5BC6\u7801\u7C7B\u578B
-AUTH_TYPE.ITEM.USER_ACCOUNT_HMAC=HMAC \u5BC6\u94A5 (\u5DF2\u5F03\u7528)
 AUTH_TYPE.ITEM.GS_SERVICE_ACCOUNT=\u670D\u52A1\u5E10\u6237
 AUTH_TYPE.ITEM.TOKEN=OAuth \u8BBF\u95EE\u4EE4\u724C
 GS_SERVICE_ACCOUNT_KEY.NAME=\u670D\u52A1\u5E10\u6237\u5BC6\u94A5

main/plugins/org.talend.designer.components.localprovider/components/tBonitaDeploy/tBonitaDeploy_java.xml

@@ -36,11 +36,7 @@
   <PARAMETERS>
 
   	<PARAMETER NAME="DB_VERSION" FIELD="CLOSED_LIST" NUM_ROW="1">
-		<ITEMS DEFAULT="BONITA_523">
-			<ITEM NAME="BONITA_523" VALUE="antlr-2.7.6.jar;asm-1.5.3.jar;asm-3.1.jar;asm-attrs-1.5.3.jar;cglib-nodep-2.1_3.jar;commons-collections-2.1.1.jar;commons-logging-1.0.4.jar;dom4j-2.1.3.jar;ehcache-1.2.3.jar;groovy-all-1.7.0.jar;h2-1.2.132.jar;hibernate-3.2.6.ga.jar;jline-0.9.94.jar;jta-1.1.jar;novaBpmIdentity-1.0.jar;novaBpmPerf-1.0.jar;novaBpmUtil-1.0.jar" />
-			<ITEM NAME="BONITA_531" VALUE="novaBpmIdentity-1.0.jar;novaBpmPerf-1.0.jar;novaBpmUtil-1.0.jar;hibernate-core-3.5.6-Final.jar;commons-collections-3.2.2.jar;ehcache-core-2.2.0.jar;hibernate-commons-annotations-3.2.0.Final.jar;hibernate-search-3.2.1.Final.jar;javassist-3.8.0.GA.jar;lucene-core-2.9.3.jar;slf4j-api-1.6.1.jar;dom4j-2.1.3.jar;h2-1.2.132.jar;jta-1.1.jar;antlr-2.7.6.jar;commons-logging-1.1.1.jar" />
-			<ITEM NAME="BONITA_561" VALUE="BONITA_561" />
-			<ITEM NAME="BONITA_5101" VALUE="BONITA_5101" />
+		<ITEMS DEFAULT="BONITA_724">
 			<ITEM NAME="BONITA_652" VALUE="BONITA_652" />
 			<ITEM NAME="BONITA_724" VALUE="BONITA_724" />
 		</ITEMS>
@@ -70,59 +66,11 @@
       NUM_ROW="15"
       REQUIRED="true"
       GROUP="CONFIGURATION"
-      SHOW_IF="(DB_VERSION!='BONITA_523') AND (DB_VERSION!='BONITA_531') AND (CLIENT_MODE=='JAVA_CLIENT')"
+      SHOW_IF="CLIENT_MODE=='JAVA_CLIENT'"
     >
     	<DEFAULT>""</DEFAULT>
     </PARAMETER>
 
-	<!--config bonita-environment.xml file  -->
-	<PARAMETER
-      NAME="BONITA_ENVIRONMENT_FILE"
-      FIELD="FILE"
-      NUM_ROW="20"
-      REQUIRED="true"
-      GROUP="CONFIGURATION"
-      SHOW_IF="(DB_VERSION=='BONITA_523' OR DB_VERSION=='BONITA_531') AND (CLIENT_MODE=='JAVA_CLIENT')"
-    >
-    	<DEFAULT>"runtime/conf/bonita-environment.xml"</DEFAULT>
-    </PARAMETER>
-
-	<!--config jaas-standard.cfg file  -->
-	<PARAMETER
-      NAME="JASS_STANDARD_FILE"
-      FIELD="FILE"
-      NUM_ROW="25"
-      REQUIRED="true"
-      GROUP="CONFIGURATION"
-      SHOW_IF="(DB_VERSION!='BONITA_652') AND (DB_VERSION!='BONITA_724') AND (CLIENT_MODE=='JAVA_CLIENT')"
-    >
-    	<DEFAULT>"external/security/jaas-standard.cfg"</DEFAULT>
-    </PARAMETER>
-
-	<!--config logging.properties file  -->
-	<PARAMETER
-      NAME="LOGGING_FILE"
-      FIELD="FILE"
-      NUM_ROW="30"
-      REQUIRED="true"
-      GROUP="CONFIGURATION"
-      SHOW_IF="isShow[JASS_STANDARD_FILE]"
-    >
-    	<DEFAULT>"external/logging/logging.properties"</DEFAULT>
-    </PARAMETER>
-
-    <!--config the login module name, located in the jaas-standard.cfg  -->
-	<PARAMETER
-      NAME="LOGIN_MODULE"
-      FIELD="TEXT"
-      NUM_ROW="40"
-      REQUIRED="true"
-      GROUP="CONFIGURATION"
-      SHOW_IF="isShow[JASS_STANDARD_FILE]"
-    >
-    	<DEFAULT>"BonitaStore"</DEFAULT>
-    </PARAMETER>
-
 	<PARAMETER
       NAME="BUSINESS_ARCHIVE"
       FIELD="FILE"
@@ -163,66 +111,12 @@
   <ADVANCED_PARAMETERS>
   </ADVANCED_PARAMETERS>
 
-   	<CODEGENERATION>
-	   <IMPORTS>
+	<CODEGENERATION>
+		<IMPORTS>
 
-	     <IMPORT NAME="xstream-1.4.17.jar" MODULE="xstream-1.4.17.jar" MVN="mvn:com.thoughtworks.xstream/xstream/1.4.17" REQUIRED_IF="(DB_VERSION=='BONITA_523') OR (((DB_VERSION=='BONITA_652')OR(DB_VERSION=='BONITA_724')) AND (CLIENT_MODE=='JAVA_CLIENT'))" />
-	     <IMPORT NAME="mxparser-1.2.1.jar" MODULE="mxparser-1.2.1.jar" MVN="mvn:io.github.x-stream/mxparser/1.2.1" REQUIRED_IF="(DB_VERSION=='BONITA_523') OR (((DB_VERSION=='BONITA_652')OR(DB_VERSION=='BONITA_724')) AND (CLIENT_MODE=='JAVA_CLIENT'))" />
+			<IMPORT NAME="xstream-1.4.17.jar" MODULE="xstream-1.4.17.jar" MVN="mvn:com.thoughtworks.xstream/xstream/1.4.17" REQUIRED_IF="(((DB_VERSION=='BONITA_652')OR(DB_VERSION=='BONITA_724')) AND (CLIENT_MODE=='JAVA_CLIENT'))" />
+			<IMPORT NAME="mxparser-1.2.1.jar" MODULE="mxparser-1.2.1.jar" MVN="mvn:io.github.x-stream/mxparser/1.2.1" REQUIRED_IF="(((DB_VERSION=='BONITA_652')OR(DB_VERSION=='BONITA_724')) AND (CLIENT_MODE=='JAVA_CLIENT'))" />
 
-			<!-- Bonita 5.2.3 -->
-			<IMPORT NAME="bonita_client_523" MODULE="bonita-client-5.2.3.jar" MVN="mvn:org.talend.libraries/bonita-client-5.2.3/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.bonita/lib/bonita-client-5.2.3.jar" REQUIRED_IF="DB_VERSION=='BONITA_523'" />
-			<IMPORT NAME="bonita_server_523" MODULE="bonita-server-5.2.3.jar" MVN="mvn:org.talend.libraries/bonita-server-5.2.3/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.bonita/lib/bonita-server-5.2.3.jar" REQUIRED_IF="DB_VERSION=='BONITA_523'" />
-			<IMPORT NAME="atlr_276" MODULE="antlr-2.7.6.jar" MVN="mvn:org.talend.libraries/antlr-2.7.6/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.apache.axis2/lib/antlr-2.7.6.jar" REQUIRED_IF="(DB_VERSION=='BONITA_561') OR (DB_VERSION=='BONITA_5101')" />
-			<IMPORT NAME="asm_153" MODULE="asm-1.5.3.jar" MVN="mvn:org.talend.libraries/asm-1.5.3/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.asm/lib/asm-1.5.3.jar" REQUIRED="false" />
-			<IMPORT NAME="asm_31" MODULE="asm-3.1.jar" MVN="mvn:org.talend.libraries/asm-3.1/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.asm/lib/asm-3.1.jar" REQUIRED="false" />
-			<IMPORT NAME="asm_attrs_153" MODULE="asm-attrs-1.5.3.jar" MVN="mvn:org.talend.libraries/asm-attrs-1.5.3/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.asm/lib/asm-attrs-1.5.3.jar" REQUIRED="false" />
-
-			<IMPORT NAME="cglib_nodep_213" MODULE="cglib-nodep-2.1_3.jar" MVN="mvn:org.talend.libraries/cglib-nodep-2.1_3/6.0.0"  REQUIRED="false" />
-			<IMPORT NAME="commons_collections_211" MODULE="commons-collections-2.1.1.jar" MVN="mvn:org.talend.libraries/commons-collections-2.1.1/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-collections-2.1.1.jar" REQUIRED="false" />
-			<IMPORT NAME="commons_logging_104" MODULE="commons-logging-1.0.4.jar" MVN="mvn:org.talend.libraries/commons-logging-1.0.4/6.0.0"  UrlPath="platform:/base/plugins/org.apache.commons.logging_1.0.4.v201101211617.jar" REQUIRED="false" />
-			<IMPORT NAME="dom4j2" MODULE="dom4j-2.1.3.jar" MVN="mvn:org.dom4j/dom4j/2.1.3" REQUIRED_IF="DB_VERSION=='BONITA_561'" BundleID="" />
-			<IMPORT NAME="ehcache_123" MODULE="ehcache-1.2.3.jar" MVN="mvn:org.talend.libraries/ehcache-1.2.3/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.ehcache/lib/ehcache-1.2.3.jar" REQUIRED="false" />
-			<IMPORT NAME="groovy_all_170" MODULE="groovy-all-1.7.0.jar" MVN="mvn:org.talend.libraries/groovy-all-1.7.0/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.groovy/lib/groovy-all-1.7.0.jar" REQUIRED="false" />
-
-			<IMPORT NAME="h2_12132" MODULE="h2-1.2.132.jar" MVN="mvn:com.h2database/h2/1.2.132"  REQUIRED="false" />
-			<IMPORT NAME="hibernate_326_ga" MODULE="hibernate-3.2.6.ga.jar" MVN="mvn:org.talend.libraries/hibernate-3.2.6.ga/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.hibernate/lib/hibernate-3.2.6.ga.jar" REQUIRED="false" />
-			<IMPORT NAME="jline_0994" MODULE="jline-0.9.94.jar" MVN="mvn:org.talend.libraries/jline-0.9.94/6.0.0"  REQUIRED="false" />
-			<IMPORT NAME="jta_11" MODULE="jta-1.1.jar" MVN="mvn:javax.transaction/jta/1.1"  REQUIRED_IF="(DB_VERSION=='BONITA_561') OR (DB_VERSION=='BONITA_5101')" />
-			<IMPORT NAME="novabpmidentity_10" MODULE="novaBpmIdentity-1.0.jar" MVN="mvn:org.talend.libraries/novaBpmIdentity-1.0/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.novabpm/lib/novaBpmIdentity-1.0.jar" REQUIRED="false" />
-			<IMPORT NAME="novabpmperf_10" MODULE="novaBpmPerf-1.0.jar" MVN="mvn:org.talend.libraries/novaBpmPerf-1.0/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.novabpm/lib/novaBpmPerf-1.0.jar" REQUIRED="false" />
-
-			<IMPORT NAME="novabpmutil_10" MODULE="novaBpmUtil-1.0.jar" MVN="mvn:org.talend.libraries/novaBpmUtil-1.0/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.novabpm/lib/novaBpmUtil-1.0.jar" REQUIRED="false" />
-			<IMPORT NAME="xpp3_min_1134O" MODULE="xpp3_min-1.1.3.4.O.jar" MVN="mvn:org.talend.libraries/xpp3_min-1.1.3.4.O/6.0.0" REQUIRED_IF="DB_VERSION=='BONITA_523'" />
-
-			<!-- Bonita 5.3.1 -->
-			<IMPORT NAME="bonita_client_53" MODULE="bonita-client-5.3.jar" MVN="mvn:org.talend.libraries/bonita-client-5.3/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.bonita/lib/bonita-client-5.3.jar" REQUIRED_IF="DB_VERSION=='BONITA_531'" />
-			<IMPORT NAME="bonita_server_53" MODULE="bonita-server-5.3.jar" MVN="mvn:org.talend.libraries/bonita-server-5.3/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.bonita/lib/bonita-server-5.3.jar" REQUIRED_IF="DB_VERSION=='BONITA_531'" />
-			<IMPORT NAME="hibernate_core_356" MODULE="hibernate-core-3.5.6-Final.jar" MVN="mvn:org.talend.libraries/hibernate-core-3.5.6-Final/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.hibernate/lib/hibernate-core-3.5.6-Final.jar" REQUIRED_IF="DB_VERSION=='BONITA_561'" />
-			<IMPORT NAME="commons_collections_31" MODULE="commons-collections-3.2.2.jar" MVN="mvn:commons-collections/commons-collections/3.2.2" UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-collections-3.2.2.jar" REQUIRED_IF="(DB_VERSION=='BONITA_561') OR (DB_VERSION=='BONITA_5101')" />
-			<IMPORT NAME="ehcache_core_220" MODULE="ehcache-core-2.2.0.jar" MVN="mvn:org.talend.libraries/ehcache-core-2.2.0/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.ehcache/lib/ehcache-core-2.2.0.jar" REQUIRED="false" />
-			<IMPORT NAME="hibernate_commons_annotations_320_Final" MODULE="hibernate-commons-annotations-3.2.0.Final.jar" MVN="mvn:org.talend.libraries/hibernate-commons-annotations-3.2.0.Final/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.hibernate/lib/hibernate-commons-annotations-3.2.0.Final.jar" REQUIRED_IF="(DB_VERSION=='BONITA_561') OR (DB_VERSION=='BONITA_5101')" />
-			<IMPORT NAME="hibernate_search_321_Final" MODULE="hibernate-search-3.2.1.Final.jar" MVN="mvn:org.talend.libraries/hibernate-search-3.2.1.Final/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.hibernate/lib/hibernate-search-3.2.1.Final.jar" REQUIRED_IF="DB_VERSION=='BONITA_561'" />
-			<IMPORT NAME="javassist_380_GA" MODULE="javassist-3.8.0.GA.jar" MVN="mvn:org.talend.libraries/javassist-3.8.0.GA/6.0.0" REQUIRED_IF="DB_VERSION=='BONITA_561'" />
-			<IMPORT NAME="lucene_core_293" MODULE="lucene-core-2.9.3.jar" MVN="mvn:org.talend.libraries/lucene-core-2.9.3/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.apache.lucene/lib/lucene-core-2.9.3.jar" REQUIRED_IF="DB_VERSION=='BONITA_561'" />
-			<IMPORT NAME="slf4j_api_161" MODULE="slf4j-api-1.6.1.jar" MVN="mvn:org.talend.libraries/slf4j-api-1.6.1/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.slf4j/lib/slf4j-api-1.6.1.jar" REQUIRED="false" />
-			<IMPORT NAME="commons_logging_111" 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="(DB_VERSION=='BONITA_561') OR (DB_VERSION=='BONITA_5101')" />
-
-			<!-- Bonita 5.6.1 -->
-			<IMPORT NAME="bonita_server_561" MODULE="bonita-server-5.6.1.jar" MVN="mvn:org.talend.libraries/bonita-server-5.6.1/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.bonita/lib/bonita-server-5.6.1.jar" REQUIRED_IF="DB_VERSION=='BONITA_561'" />
-			<IMPORT NAME="chemistry_opencmis_client_api_020_incubating" MODULE="chemistry-opencmis-client-api-0.2.0-incubating.jar" MVN="mvn:org.talend.libraries/chemistry-opencmis-client-api-0.2.0-incubating/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.chemistry/lib/chemistry-opencmis-client-api-0.2.0-incubating.jar" REQUIRED_IF="DB_VERSION=='BONITA_561'" />
-			<IMPORT NAME="chemistry_opencmis_commons_api_020_incubating" MODULE="chemistry-opencmis-commons-api-0.2.0-incubating.jar" MVN="mvn:org.talend.libraries/chemistry-opencmis-commons-api-0.2.0-incubating/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.chemistry/lib/chemistry-opencmis-commons-api-0.2.0-incubating.jar" REQUIRED_IF="DB_VERSION=='BONITA_561'" />
-			<IMPORT NAME="h2_12139" MODULE="h2-1.2.139.jar" MVN="mvn:com.h2database/h2/1.2.139"  REQUIRED_IF="(DB_VERSION=='BONITA_561') OR (DB_VERSION=='BONITA_5101')" />
-			<IMPORT NAME="slf4j_api_161" MODULE="slf4j-api-1.6.1.jar" MVN="mvn:org.talend.libraries/slf4j-api-1.6.1/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.slf4j/lib/slf4j-api-1.6.1.jar" REQUIRED_IF="(DB_VERSION=='BONITA_561') OR (DB_VERSION=='BONITA_5101')" />
-			<IMPORT NAME="slf4j_jdk14_1712" MODULE="slf4j-jdk14-1.7.12.jar" MVN="mvn:org.talend.libraries/slf4j-jdk14-1.7.12/6.0.0"  REQUIRED_IF="(DB_VERSION=='BONITA_561') OR (DB_VERSION=='BONITA_5101')" />
-
-			<!-- Bonita 5.10.1 -->
-			<IMPORT NAME="bonita_server_5101" MODULE="bonita-server-5.10.1.jar" MVN="mvn:org.talend.libraries/bonita-server-5.10.1/6.0.0" REQUIRED_IF="DB_VERSION=='BONITA_5101'" />
-			<IMPORT NAME="hibernate_search_330_Final" MODULE="hibernate-search-3.3.0.Final.jar" MVN="mvn:org.talend.libraries/hibernate-search-3.3.0.Final/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.hibernate/lib/hibernate-search-3.3.0.Final.jar" REQUIRED_IF="DB_VERSION=='BONITA_5101'" />
-			<IMPORT NAME="hibernate_core_3_6_10_Final" MODULE="hibernate-core-3.6.10.Final.jar" MVN="mvn:org.hibernate/hibernate-core/3.6.10.Final" REQUIRED_IF="DB_VERSION=='BONITA_5101'" />
-			<IMPORT NAME="hibernate_jpa_2_0_api-1_0_1_Final" MODULE="hibernate-jpa-2.0-api-1.0.1.Final.jar" MVN="mvn:org.talend.libraries/hibernate-jpa-2.0-api-1.0.1.Final/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.hibernate/lib/hibernate-jpa-2.0-api-1.0.1.Final.jar" REQUIRED_IF="DB_VERSION=='BONITA_5101'" />
-			<IMPORT NAME="lucene_core_303" MODULE="lucene-core-3.0.3.jar" MVN="mvn:org.talend.libraries/lucene-core-3.0.3/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.apache.lucene/lib/lucene-core-3.0.3.jar" REQUIRED_IF="DB_VERSION=='BONITA_5101'" />
-			<IMPORT NAME="javassist_3120_GA" MODULE="javassist-3.12.0.GA.jar" MVN="mvn:org.talend.libraries/javassist-3.12.0.GA/6.0.0" REQUIRED_IF="DB_VERSION=='BONITA_5101'" />
-			
 			<!-- Bonita 6.5.2 HTTP API -->
 			<IMPORT NAME="talend-bonita-client-1.0.1.jar" MODULE="talend-bonita-client-1.0.1.jar" MVN="mvn:org.talend.bonita/talend-bonita-client/1.0.1" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='HTTP_CLIENT')" />
 			<IMPORT NAME="bonita-client-6.5.2.jar" MODULE="bonita-client-6.5.2.jar" MVN="mvn:org.talend.libraries/bonita-client-6.5.2/6.0.0" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='HTTP_CLIENT')" />
@@ -271,7 +165,7 @@
 			<IMPORT NAME="commons-logging-1.2.jar" MODULE="commons-logging-1.2.jar" MVN="mvn:commons-logging/commons-logging/1.2" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='JAVA_CLIENT')" />
 			<IMPORT NAME="commons-codec-1.14.jar" MODULE="commons-codec-1.14.jar" MVN="mvn:commons-codec/commons-codec/1.14" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='JAVA_CLIENT')" />
 			<IMPORT NAME="commons-io-2.8.0.jar" MODULE="commons-io-2.8.0.jar" MVN="mvn:commons-io/commons-io/2.8.0" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='JAVA_CLIENT')" />
-	     </IMPORTS>
+		</IMPORTS>
 	</CODEGENERATION>
 
   <RETURNS>

main/plugins/org.talend.designer.components.localprovider/components/tBonitaDeploy/tBonitaDeploy_messages.properties

@@ -4,10 +4,6 @@ LONG_NAME=Deploy
 HELP=org.talend.help.tBonitaDeploy
 
 DB_VERSION.NAME = Bonita version
-DB_VERSION.ITEM.BONITA_523 = 5.2.3 (Deprecated)
-DB_VERSION.ITEM.BONITA_531 = 5.3.1 (Deprecated)
-DB_VERSION.ITEM.BONITA_561 = 5.6.1 (Deprecated)
-DB_VERSION.ITEM.BONITA_5101 = 5.10.1 (Deprecated)
 DB_VERSION.ITEM.BONITA_652 = 6.5.2
 DB_VERSION.ITEM.BONITA_724 = 7.2.4
 

main/plugins/org.talend.designer.components.localprovider/components/tBonitaDeploy/tBonitaDeploy_messages_fr.properties

@@ -4,10 +4,6 @@ LONG_NAME=D\u00E9ployer un workflow Bonita
 HELP=org.talend.help.tBonitaDeploy
 
 DB_VERSION.NAME = Version de Bonita
-DB_VERSION.ITEM.BONITA_523 = 5.2.3 (D\u00E9pr\u00E9ci\u00E9)
-DB_VERSION.ITEM.BONITA_531 = 5.3.1 (D\u00E9pr\u00E9ci\u00E9)
-DB_VERSION.ITEM.BONITA_561 = 5.6.1 (D\u00E9pr\u00E9ci\u00E9)
-DB_VERSION.ITEM.BONITA_5101 = 5.10.1 (D\u00E9pr\u00E9ci\u00E9)
 DB_VERSION.ITEM.BONITA_652 = 6.5.2
 DB_VERSION.ITEM.BONITA_724 = 7.2.4
 

main/plugins/org.talend.designer.components.localprovider/components/tBonitaDeploy/tBonitaDeploy_messages_ja.properties

@@ -4,10 +4,6 @@ LONG_NAME=Bonita\u30EF\u30FC\u30AF\u30D5\u30ED\u30FC\u3092\u30C7\u30D7\u30ED\u30
 HELP=org.talend.help.tBonitaDeploy
 
 DB_VERSION.NAME = Bonita\u30D0\u30FC\u30B8\u30E7\u30F3
-DB_VERSION.ITEM.BONITA_523 = 5.2.3 (\u975E\u63A8\u5968)
-DB_VERSION.ITEM.BONITA_531 = 5.3.1 (\u975E\u63A8\u5968)
-DB_VERSION.ITEM.BONITA_561 = 5.6.1 (\u975E\u63A8\u5968)
-DB_VERSION.ITEM.BONITA_5101 = 5.10.1 (\u975E\u63A8\u5968)
 DB_VERSION.ITEM.BONITA_652 = 6.5.2
 DB_VERSION.ITEM.BONITA_724 = 7.2.4
 

main/plugins/org.talend.designer.components.localprovider/components/tBonitaDeploy/tBonitaDeploy_messages_zh_CN.properties

@@ -4,10 +4,6 @@ LONG_NAME=\u90E8\u7F72\u00A0Bonita\u00A0\u5DE5\u4F5C\u6D41
 HELP=org.talend.help.tBonitaDeploy
 
 DB_VERSION.NAME = Bonita \u7248\u672C
-DB_VERSION.ITEM.BONITA_523 = 5.2.3 (\u5DF2\u5F03\u7528)
-DB_VERSION.ITEM.BONITA_531 = 5.3.1 (\u5DF2\u5F03\u7528)
-DB_VERSION.ITEM.BONITA_561 = 5.6.1 (\u5DF2\u5F03\u7528)
-DB_VERSION.ITEM.BONITA_5101 = 5.10.1 (\u5DF2\u5F03\u7528)
 DB_VERSION.ITEM.BONITA_652 = 6.5.2
 DB_VERSION.ITEM.BONITA_724 = 7.2.4
 

main/plugins/org.talend.designer.components.localprovider/components/tBonitaInstantiateProcess/tBonitaInstantiateProcess_java.xml

@@ -49,11 +49,7 @@
     </PARAMETER>
 
 	<PARAMETER NAME="DB_VERSION" FIELD="CLOSED_LIST" NUM_ROW="2">
-		<ITEMS DEFAULT="BONITA_523">
-			<ITEM NAME="BONITA_523" VALUE="antlr-2.7.6.jar;asm-1.5.3.jar;asm-3.1.jar;asm-attrs-1.5.3.jar;cglib-nodep-2.1_3.jar;commons-collections-2.1.1.jar;commons-logging-1.0.4.jar;dom4j-2.1.3.jar;ehcache-1.2.3.jar;groovy-all-1.7.0.jar;h2-1.2.132.jar;hibernate-3.2.6.ga.jar;jline-0.9.94.jar;jta-1.1.jar;novaBpmIdentity-1.0.jar;novaBpmPerf-1.0.jar;novaBpmUtil-1.0.jar" />
-			<ITEM NAME="BONITA_531" VALUE="novaBpmIdentity-1.0.jar;novaBpmPerf-1.0.jar;novaBpmUtil-1.0.jar;hibernate-core-3.5.6-Final.jar;commons-collections-3.2.2.jar;ehcache-core-2.2.0.jar;hibernate-commons-annotations-3.2.0.Final.jar;hibernate-search-3.2.1.Final.jar;javassist-3.8.0.GA.jar;lucene-core-2.9.3.jar;slf4j-api-1.6.1.jar;dom4j-2.1.3.jar;h2-1.2.132.jar;jta-1.1.jar;antlr-2.7.6.jar;commons-logging-1.1.1.jar" />
-			<ITEM NAME="BONITA_561" VALUE="BONITA_561" />
-			<ITEM NAME="BONITA_5101" VALUE="BONITA_5101" />
+		<ITEMS DEFAULT="BONITA_724">
 			<ITEM NAME="BONITA_652" VALUE="BONITA_652" />
 			<ITEM NAME="BONITA_724" VALUE="BONITA_724" />
 		</ITEMS>
@@ -73,18 +69,9 @@
       REQUIRED="true"
       SHOW_IF="CLIENT_MODE=='HTTP_CLIENT'"
     >
-    	<DEFAULT IF="(DB_VERSION!='BONITA_652') AND (DB_VERSION!='BONITA_724')">"http://localhost:9090/bonita-server-rest/"</DEFAULT>
     	<DEFAULT IF="(DB_VERSION=='BONITA_652') OR (DB_VERSION=='BONITA_724')">"http://localhost:8080/bonita"</DEFAULT>
     </PARAMETER>
 
-    <PARAMETER NAME="AUTH_USERNAME" FIELD="TEXT" NUM_ROW="12" REQUIRED="true" SHOW_IF="(DB_VERSION!='BONITA_652') AND (DB_VERSION!='BONITA_724') AND (CLIENT_MODE=='HTTP_CLIENT')" GROUP="AUTHORIZATION">
-    	<DEFAULT>"restuser"</DEFAULT>
-    </PARAMETER>
-
-    <PARAMETER NAME="AUTH_PASSWD" FIELD="PASSWORD" NUM_ROW="12" REQUIRED="true" SHOW_IF="isShow[AUTH_USERNAME]" GROUP="AUTHORIZATION">
-    	<DEFAULT>"restbpm"</DEFAULT>
-    </PARAMETER>
-
   	<!--config bonita-home path  -->
 	<PARAMETER
       NAME="BONITA_HOME"
@@ -92,59 +79,11 @@
       NUM_ROW="15"
       REQUIRED="true"
       GROUP="CONFIGURATION"
-      SHOW_IF="(CLIENT_MODE=='JAVA_CLIENT') AND (DB_VERSION!='BONITA_523') AND (DB_VERSION!='BONITA_531')"
+      SHOW_IF="(CLIENT_MODE=='JAVA_CLIENT')"
     >
     	<DEFAULT>""</DEFAULT>
     </PARAMETER>
 
-  	<!--config bonita-environment.xml file  -->
-	<PARAMETER
-      NAME="BONITA_ENVIRONMENT_FILE"
-      FIELD="FILE"
-      NUM_ROW="20"
-      REQUIRED="true"
-      GROUP="CONFIGURATION"
-      SHOW_IF="(CLIENT_MODE=='JAVA_CLIENT') AND ((DB_VERSION=='BONITA_523') OR (DB_VERSION=='BONITA_531'))"
-    >
-    	<DEFAULT>"runtime/conf/bonita-environment.xml"</DEFAULT>
-    </PARAMETER>
-
-	<!--config jaas-standard.cfg file  -->
-	<PARAMETER
-      NAME="JASS_STANDARD_FILE"
-      FIELD="FILE"
-      NUM_ROW="25"
-      REQUIRED="true"
-      SHOW_IF="(DB_VERSION!='BONITA_652') AND (DB_VERSION!='BONITA_724') AND (CLIENT_MODE=='JAVA_CLIENT')"
-      GROUP="CONFIGURATION"
-    >
-    	<DEFAULT>"external/security/jaas-standard.cfg"</DEFAULT>
-    </PARAMETER>
-
-	<!--config logging.properties file  -->
-	<PARAMETER
-      NAME="LOGGING_FILE"
-      FIELD="FILE"
-      NUM_ROW="30"
-      REQUIRED="true"
-      SHOW_IF="isShow[JASS_STANDARD_FILE]"
-      GROUP="CONFIGURATION"
-    >
-    	<DEFAULT>"external/logging/logging.properties"</DEFAULT>
-    </PARAMETER>
-
-	<!--config the login module name, located in the jaas-standard.cfg  -->
-	<PARAMETER
-      NAME="LOGIN_MODULE"
-      FIELD="TEXT"
-      NUM_ROW="40"
-      REQUIRED="true"
-      SHOW_IF="isShow[JASS_STANDARD_FILE]"
-      GROUP="CONFIGURATION"
-    >
-    	<DEFAULT>"BonitaStore"</DEFAULT>
-    </PARAMETER>
-
 	<PARAMETER NAME="USE_PROCESS_ID" FIELD="CHECK" NUM_ROW="45" SHOW_IF="(DB_VERSION=='BONITA_652') OR (DB_VERSION=='BONITA_724') OR (CLIENT_MODE=='JAVA_CLIENT')">
 		<DEFAULT>false</DEFAULT>
 	</PARAMETER>
@@ -185,7 +124,6 @@
       NUM_ROW="60"
       REQUIRED="true"
     >
-    	<DEFAULT IF="(DB_VERSION!='BONITA_652') AND (DB_VERSION!='BONITA_724')">"admin"</DEFAULT>
    		<DEFAULT IF="(DB_VERSION=='BONITA_652') OR (DB_VERSION=='BONITA_724')">""</DEFAULT>
     </PARAMETER>
 
@@ -212,63 +150,11 @@
   <ADVANCED_PARAMETERS>
   </ADVANCED_PARAMETERS>
 
-   	<CODEGENERATION>
-	   <IMPORTS>
+	<CODEGENERATION>
+		<IMPORTS>
 
-		<IMPORT NAME="xstream-1.4.17.jar" MODULE="xstream-1.4.17.jar" MVN="mvn:com.thoughtworks.xstream/xstream/1.4.17" REQUIRED_IF="((DB_VERSION!='BONITA_652') AND (DB_VERSION!='BONITA_724')) OR (((DB_VERSION=='BONITA_652')OR(DB_VERSION=='BONITA_724')) AND (CLIENT_MODE=='JAVA_CLIENT'))" />
-		<IMPORT NAME="mxparser-1.2.1.jar" MODULE="mxparser-1.2.1.jar" MVN="mvn:io.github.x-stream/mxparser/1.2.1" REQUIRED_IF="((DB_VERSION!='BONITA_652') AND (DB_VERSION!='BONITA_724')) OR (((DB_VERSION=='BONITA_652')OR(DB_VERSION=='BONITA_724')) AND (CLIENT_MODE=='JAVA_CLIENT'))" />
-			<!-- Bonita 5.2.3 -->
-			<IMPORT NAME="bonita_client_523" MODULE="bonita-client-5.2.3.jar" MVN="mvn:org.talend.libraries/bonita-client-5.2.3/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.bonita/lib/bonita-client-5.2.3.jar" REQUIRED_IF="DB_VERSION=='BONITA_523'" />
-			<IMPORT NAME="bonita_server_523" MODULE="bonita-server-5.2.3.jar" MVN="mvn:org.talend.libraries/bonita-server-5.2.3/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.bonita/lib/bonita-server-5.2.3.jar" REQUIRED_IF="DB_VERSION=='BONITA_523'" />
-			<IMPORT NAME="atlr_276" MODULE="antlr-2.7.6.jar" MVN="mvn:org.talend.libraries/antlr-2.7.6/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.apache.axis2/lib/antlr-2.7.6.jar" REQUIRED_IF="(CLIENT_MODE=='JAVA_CLIENT') AND (DB_VERSION=='BONITA_561' OR DB_VERSION=='BONITA_5101')" />
-			<IMPORT NAME="asm_153" MODULE="asm-1.5.3.jar" MVN="mvn:org.talend.libraries/asm-1.5.3/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.asm/lib/asm-1.5.3.jar" REQUIRED="false" />
-			<IMPORT NAME="asm_31" MODULE="asm-3.1.jar" MVN="mvn:org.talend.libraries/asm-3.1/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.asm/lib/asm-3.1.jar" REQUIRED="false" />
-			<IMPORT NAME="asm_attrs_153" MODULE="asm-attrs-1.5.3.jar" MVN="mvn:org.talend.libraries/asm-attrs-1.5.3/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.asm/lib/asm-attrs-1.5.3.jar" REQUIRED="false" />
-
-			<IMPORT NAME="cglib_nodep_213" MODULE="cglib-nodep-2.1_3.jar" MVN="mvn:org.talend.libraries/cglib-nodep-2.1_3/6.0.0"  REQUIRED="false" />
-			<IMPORT NAME="commons_collections_211" MODULE="commons-collections-2.1.1.jar" MVN="mvn:org.talend.libraries/commons-collections-2.1.1/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-collections-2.1.1.jar" REQUIRED="false" />
-			<IMPORT NAME="commons_logging_104" MODULE="commons-logging-1.0.4.jar" MVN="mvn:org.talend.libraries/commons-logging-1.0.4/6.0.0"  UrlPath="platform:/base/plugins/org.apache.commons.logging_1.0.4.v201101211617.jar" REQUIRED="false" />
-			<IMPORT NAME="dom4j2" MODULE="dom4j-2.1.3.jar" MVN="mvn:org.dom4j/dom4j/2.1.3"  REQUIRED_IF="(CLIENT_MODE=='JAVA_CLIENT') AND (DB_VERSION=='BONITA_561')" BundleID="" />
-			<IMPORT NAME="ehcache_123" MODULE="ehcache-1.2.3.jar" MVN="mvn:org.talend.libraries/ehcache-1.2.3/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.ehcache/lib/ehcache-1.2.3.jar" REQUIRED="false" />
-			<IMPORT NAME="groovy_all_170" MODULE="groovy-all-1.7.0.jar" MVN="mvn:org.talend.libraries/groovy-all-1.7.0/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.groovy/lib/groovy-all-1.7.0.jar" REQUIRED="false" />
-
-			<IMPORT NAME="h2_12132" MODULE="h2-1.2.132.jar" MVN="mvn:com.h2database/h2/1.2.132"  REQUIRED="false" />
-			<IMPORT NAME="hibernate_326_ga" MODULE="hibernate-3.2.6.ga.jar" MVN="mvn:org.talend.libraries/hibernate-3.2.6.ga/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.hibernate/lib/hibernate-3.2.6.ga.jar" REQUIRED="false" />
-			<IMPORT NAME="jline_0994" MODULE="jline-0.9.94.jar" MVN="mvn:org.talend.libraries/jline-0.9.94/6.0.0"  REQUIRED="false" />
-			<IMPORT NAME="jta_11" MODULE="jta-1.1.jar" MVN="mvn:javax.transaction/jta/1.1"  REQUIRED_IF="(CLIENT_MODE=='JAVA_CLIENT') AND (DB_VERSION=='BONITA_561' OR DB_VERSION=='BONITA_5101')" />
-			<IMPORT NAME="novabpmidentity_10" MODULE="novaBpmIdentity-1.0.jar" MVN="mvn:org.talend.libraries/novaBpmIdentity-1.0/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.novabpm/lib/novaBpmIdentity-1.0.jar" REQUIRED="false" />
-			<IMPORT NAME="novabpmperf_10" MODULE="novaBpmPerf-1.0.jar" MVN="mvn:org.talend.libraries/novaBpmPerf-1.0/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.novabpm/lib/novaBpmPerf-1.0.jar" REQUIRED="false" />
-
-			<IMPORT NAME="novabpmutil_10" MODULE="novaBpmUtil-1.0.jar" MVN="mvn:org.talend.libraries/novaBpmUtil-1.0/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.novabpm/lib/novaBpmUtil-1.0.jar" REQUIRED="false" />
-			<IMPORT NAME="xpp3_min_1134O" MODULE="xpp3_min-1.1.3.4.O.jar" MVN="mvn:org.talend.libraries/xpp3_min-1.1.3.4.O/6.0.0" REQUIRED_IF="DB_VERSION=='BONITA_523'" />
-
-			<!-- Bonita 5.3.1 -->
-			<IMPORT NAME="bonita_client_53" MODULE="bonita-client-5.3.jar" MVN="mvn:org.talend.libraries/bonita-client-5.3/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.bonita/lib/bonita-client-5.3.jar" REQUIRED_IF="DB_VERSION=='BONITA_531'" />
-			<IMPORT NAME="bonita_server_53" MODULE="bonita-server-5.3.jar" MVN="mvn:org.talend.libraries/bonita-server-5.3/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.bonita/lib/bonita-server-5.3.jar" REQUIRED_IF="DB_VERSION=='BONITA_531'" />
-			<IMPORT NAME="hibernate_core_356" MODULE="hibernate-core-3.5.6-Final.jar" MVN="mvn:org.talend.libraries/hibernate-core-3.5.6-Final/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.hibernate/lib/hibernate-core-3.5.6-Final.jar" REQUIRED_IF="(CLIENT_MODE=='JAVA_CLIENT') AND (DB_VERSION=='BONITA_561')" />
-			<IMPORT NAME="commons_collections_31" MODULE="commons-collections-3.2.2.jar" MVN="mvn:commons-collections/commons-collections/3.2.2" UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-collections-3.2.2.jar" REQUIRED_IF="(CLIENT_MODE=='JAVA_CLIENT') AND (DB_VERSION=='BONITA_561' OR DB_VERSION=='BONITA_5101')" />
-			<IMPORT NAME="ehcache_core_220" MODULE="ehcache-core-2.2.0.jar" MVN="mvn:org.talend.libraries/ehcache-core-2.2.0/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.ehcache/lib/ehcache-core-2.2.0.jar" REQUIRED="false" />
-			<IMPORT NAME="hibernate_commons_annotations_320_Final" MODULE="hibernate-commons-annotations-3.2.0.Final.jar" MVN="mvn:org.talend.libraries/hibernate-commons-annotations-3.2.0.Final/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.hibernate/lib/hibernate-commons-annotations-3.2.0.Final.jar" REQUIRED_IF="(CLIENT_MODE=='JAVA_CLIENT') AND (DB_VERSION=='BONITA_561' OR DB_VERSION=='BONITA_5101')" />
-			<IMPORT NAME="hibernate_search_321_Final" MODULE="hibernate-search-3.2.1.Final.jar" MVN="mvn:org.talend.libraries/hibernate-search-3.2.1.Final/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.hibernate/lib/hibernate-search-3.2.1.Final.jar" REQUIRED_IF="(CLIENT_MODE=='JAVA_CLIENT') AND (DB_VERSION=='BONITA_561')" />
-			<IMPORT NAME="javassist_380_GA" MODULE="javassist-3.8.0.GA.jar" MVN="mvn:org.talend.libraries/javassist-3.8.0.GA/6.0.0" REQUIRED_IF="(CLIENT_MODE=='JAVA_CLIENT') AND (DB_VERSION=='BONITA_561')" />
-			<IMPORT NAME="lucene_core_293" MODULE="lucene-core-2.9.3.jar" MVN="mvn:org.talend.libraries/lucene-core-2.9.3/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.apache.lucene/lib/lucene-core-2.9.3.jar" REQUIRED_IF="(CLIENT_MODE=='JAVA_CLIENT') AND (DB_VERSION=='BONITA_561')" />
-			<IMPORT NAME="slf4j_api_161" MODULE="slf4j-api-1.6.1.jar" MVN="mvn:org.talend.libraries/slf4j-api-1.6.1/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.slf4j/lib/slf4j-api-1.6.1.jar" REQUIRED="false" />
-			<IMPORT NAME="commons_logging_111" 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="(CLIENT_MODE=='JAVA_CLIENT') AND (DB_VERSION=='BONITA_561' OR DB_VERSION=='BONITA_5101')" />
-
-			<!-- Bonita 5.6.1 -->
-			<IMPORT NAME="bonita_server_561" MODULE="bonita-server-5.6.1.jar" MVN="mvn:org.talend.libraries/bonita-server-5.6.1/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.bonita/lib/bonita-server-5.6.1.jar" REQUIRED_IF="(CLIENT_MODE=='JAVA_CLIENT') AND (DB_VERSION=='BONITA_561')" />
-			<IMPORT NAME="chemistry_opencmis_client_api_020_incubating" MODULE="chemistry-opencmis-client-api-0.2.0-incubating.jar" MVN="mvn:org.talend.libraries/chemistry-opencmis-client-api-0.2.0-incubating/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.chemistry/lib/chemistry-opencmis-client-api-0.2.0-incubating.jar" REQUIRED_IF="(CLIENT_MODE=='JAVA_CLIENT') AND (DB_VERSION=='BONITA_561')" />
-			<IMPORT NAME="chemistry_opencmis_commons_api_020_incubating" MODULE="chemistry-opencmis-commons-api-0.2.0-incubating.jar" MVN="mvn:org.talend.libraries/chemistry-opencmis-commons-api-0.2.0-incubating/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.chemistry/lib/chemistry-opencmis-commons-api-0.2.0-incubating.jar" REQUIRED_IF="(CLIENT_MODE=='JAVA_CLIENT') AND (DB_VERSION=='BONITA_561')" />
-			<IMPORT NAME="h2_12139" MODULE="h2-1.2.139.jar" MVN="mvn:com.h2database/h2/1.2.139"  REQUIRED_IF="(CLIENT_MODE=='JAVA_CLIENT') AND (DB_VERSION=='BONITA_561' OR DB_VERSION=='BONITA_5101')" />
-			<IMPORT NAME="slf4j_api_161" MODULE="slf4j-api-1.6.1.jar" MVN="mvn:org.talend.libraries/slf4j-api-1.6.1/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.slf4j/lib/slf4j-api-1.6.1.jar" REQUIRED_IF="(CLIENT_MODE=='JAVA_CLIENT') AND (DB_VERSION=='BONITA_561' OR DB_VERSION=='BONITA_5101')" />
-			<IMPORT NAME="slf4j_jdk14_1712" MODULE="slf4j-jdk14-1.7.12.jar" MVN="mvn:org.talend.libraries/slf4j-jdk14-1.7.12/6.0.0"  REQUIRED_IF="(CLIENT_MODE=='JAVA_CLIENT') AND (DB_VERSION=='BONITA_561' OR DB_VERSION=='BONITA_5101')" />
-			<!-- Bonita 5.10.1 -->
-			<IMPORT NAME="bonita_server_510" MODULE="bonita-server-5.10.1.jar" MVN="mvn:org.talend.libraries/bonita-server-5.10.1/6.0.0"  REQUIRED_IF="(CLIENT_MODE=='JAVA_CLIENT') AND (DB_VERSION=='BONITA_5101')" />
-			<IMPORT NAME="hibernate_search_330_Final" MODULE="hibernate-search-3.3.0.Final.jar" MVN="mvn:org.talend.libraries/hibernate-search-3.3.0.Final/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.hibernate/lib/hibernate-search-3.3.0.Final.jar" REQUIRED_IF="(CLIENT_MODE=='JAVA_CLIENT') AND (DB_VERSION=='BONITA_5101')" />
-			<IMPORT NAME="hibernate_core_3_6_10_Final" MODULE="hibernate-core-3.6.10.Final.jar" MVN="mvn:org.hibernate/hibernate-core/3.6.10.Final" REQUIRED_IF="(CLIENT_MODE=='JAVA_CLIENT') AND (DB_VERSION=='BONITA_5101')" />
-			<IMPORT NAME="hibernate_jpa_2_0_api-1_0_1_Final" MODULE="hibernate-jpa-2.0-api-1.0.1.Final.jar" MVN="mvn:org.talend.libraries/hibernate-jpa-2.0-api-1.0.1.Final/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.hibernate/lib/hibernate-jpa-2.0-api-1.0.1.Final.jar" REQUIRED_IF="(CLIENT_MODE=='JAVA_CLIENT') AND (DB_VERSION=='BONITA_5101')" />
-			<IMPORT NAME="lucene_core_303" MODULE="lucene-core-3.0.3.jar" MVN="mvn:org.talend.libraries/lucene-core-3.0.3/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.lucene/lib/lucene-core-3.0.3.jar" REQUIRED_IF="(CLIENT_MODE=='JAVA_CLIENT') AND (DB_VERSION=='BONITA_5101')" />
-			<IMPORT NAME="javassist_3120_GA" MODULE="javassist-3.12.0.GA.jar" MVN="mvn:org.talend.libraries/javassist-3.12.0.GA/6.0.0"  REQUIRED_IF="(CLIENT_MODE=='JAVA_CLIENT') AND (DB_VERSION=='BONITA_5101')" />
+			<IMPORT NAME="xstream-1.4.17.jar" MODULE="xstream-1.4.17.jar" MVN="mvn:com.thoughtworks.xstream/xstream/1.4.17" REQUIRED_IF="(((DB_VERSION=='BONITA_652')OR(DB_VERSION=='BONITA_724')) AND (CLIENT_MODE=='JAVA_CLIENT'))" />
+			<IMPORT NAME="mxparser-1.2.1.jar" MODULE="mxparser-1.2.1.jar" MVN="mvn:io.github.x-stream/mxparser/1.2.1" REQUIRED_IF="(((DB_VERSION=='BONITA_652')OR(DB_VERSION=='BONITA_724')) AND (CLIENT_MODE=='JAVA_CLIENT'))" />
 
 			<!-- Bonita 6.5.2 HTTP API -->
 			<IMPORT NAME="talend-bonita-client-1.0.1.jar" MODULE="talend-bonita-client-1.0.1.jar" MVN="mvn:org.talend.bonita/talend-bonita-client/1.0.1" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='HTTP_CLIENT')" />

main/plugins/org.talend.designer.components.localprovider/components/tBonitaInstantiateProcess/tBonitaInstantiateProcess_messages.properties

@@ -12,10 +12,6 @@ AUTH_USERNAME.NAME=Auth Username
 AUTH_PASSWD.NAME=Auth Password
 
 DB_VERSION.NAME = Bonita version
-DB_VERSION.ITEM.BONITA_523 = 5.2.3 (Deprecated)
-DB_VERSION.ITEM.BONITA_531 = 5.3.1 (Deprecated)
-DB_VERSION.ITEM.BONITA_561 = 5.6.1 (Deprecated)
-DB_VERSION.ITEM.BONITA_5101 = 5.10.1 (Deprecated)
 DB_VERSION.ITEM.BONITA_652 = 6.5.2
 DB_VERSION.ITEM.BONITA_724 = 7.2.4
 

main/plugins/org.talend.designer.components.localprovider/components/tBonitaInstantiateProcess/tBonitaInstantiateProcess_messages_fr.properties

@@ -12,10 +12,6 @@ AUTH_USERNAME.NAME=Identifiant d'authentification
 AUTH_PASSWD.NAME=Mot de passe d'authentification
 
 DB_VERSION.NAME = Version de Bonita
-DB_VERSION.ITEM.BONITA_523 = 5.2.3 (D\u00E9pr\u00E9ci\u00E9)
-DB_VERSION.ITEM.BONITA_531 = 5.3.1 (D\u00E9pr\u00E9ci\u00E9)
-DB_VERSION.ITEM.BONITA_561 = 5.6.1 (D\u00E9pr\u00E9ci\u00E9)
-DB_VERSION.ITEM.BONITA_5101 = 5.10.1 (D\u00E9pr\u00E9ci\u00E9)
 DB_VERSION.ITEM.BONITA_652 = 6.5.2
 DB_VERSION.ITEM.BONITA_724 = 7.2.4
 

main/plugins/org.talend.designer.components.localprovider/components/tBonitaInstantiateProcess/tBonitaInstantiateProcess_messages_ja.properties

@@ -12,10 +12,6 @@ AUTH_USERNAME.NAME=\u8A8D\u8A3C\u30E6\u30FC\u30B6\u30FC\u540D
 AUTH_PASSWD.NAME=\u8A8D\u8A3C\u30D1\u30B9\u30EF\u30FC\u30C9
 
 DB_VERSION.NAME = Bonita\u30D0\u30FC\u30B8\u30E7\u30F3
-DB_VERSION.ITEM.BONITA_523 = 5.2.3 (\u975E\u63A8\u5968)
-DB_VERSION.ITEM.BONITA_531 = 5.3.1 (\u975E\u63A8\u5968)
-DB_VERSION.ITEM.BONITA_561 = 5.6.1 (\u975E\u63A8\u5968)
-DB_VERSION.ITEM.BONITA_5101 = 5.10.1 (\u975E\u63A8\u5968)
 DB_VERSION.ITEM.BONITA_652 = 6.5.2
 DB_VERSION.ITEM.BONITA_724 = 7.2.4
 

main/plugins/org.talend.designer.components.localprovider/components/tBonitaInstantiateProcess/tBonitaInstantiateProcess_messages_zh_CN.properties

@@ -12,10 +12,6 @@ AUTH_USERNAME.NAME=\u9A8C\u8BC1\u7528\u6237\u540D
 AUTH_PASSWD.NAME=\u8BA4\u8BC1\u5BC6\u7801
 
 DB_VERSION.NAME = Bonita \u7248\u672C
-DB_VERSION.ITEM.BONITA_523 = 5.2.3 (\u5DF2\u5F03\u7528)
-DB_VERSION.ITEM.BONITA_531 = 5.3.1 (\u5DF2\u5F03\u7528)
-DB_VERSION.ITEM.BONITA_561 = 5.6.1 (\u5DF2\u5F03\u7528)
-DB_VERSION.ITEM.BONITA_5101 = 5.10.1 (\u5DF2\u5F03\u7528)
 DB_VERSION.ITEM.BONITA_652 = 6.5.2
 DB_VERSION.ITEM.BONITA_724 = 7.2.4
 

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

@@ -43,7 +43,6 @@
     			or (DBTYPE=='DBORACLE' and USE_EXISTING_CONNECTION=='TRUE') or (DBTYPE=='POSTGRE' and USE_EXISTING_CONNECTION=='TRUE')
     			or (DBTYPE=='AS400' and USE_EXISTING_CONNECTION=='TRUE') or (DBTYPE=='DB2' and USE_EXISTING_CONNECTION=='TRUE')
     			or (DBTYPE=='FIREBIRD' and USE_EXISTING_CONNECTION == 'true') or (DBTYPE=='INFORMIX' and USE_EXISTING_CONNECTION == 'true')
-    			or (DBTYPE=='INGRES' and USE_EXISTING_CONNECTION == 'true') or (DBTYPE=='INTERBASE' and USE_EXISTING_CONNECTION == 'true')
     			or (DBTYPE=='SQLITE' and USE_EXISTING_CONNECTION == 'true') or (DBTYPE=='SYBASE' and USE_EXISTING_CONNECTION == 'true')
     			or (DBTYPE=='TERADATA' and USE_EXISTING_CONNECTION == 'true') or (DBTYPE=='NETEZZA' and USE_EXISTING_CONNECTION == 'true')
     			or (DBTYPE=='POSTGREPLUS' and USE_EXISTING_CONNECTION == 'true') or (DBTYPE=='ACCESS' and USE_EXISTING_CONNECTION == 'true')
@@ -66,8 +65,6 @@
 		<ITEM NAME="GREENPLUM"   VALUE="GREENPLUM"/>
         <ITEM NAME="HSQLDB"      VALUE="HSQLDB"/>
         <ITEM NAME="INFORMIX"      VALUE="INFORMIX"/>
-        <ITEM NAME="INGRES"      VALUE="INGRES"/>
-        <ITEM NAME="INTERBASE"      VALUE="INTERBASE"/>
         <ITEM NAME="JAVADB"      VALUE="JAVADB"/>
         <ITEM NAME="MAXDB" 		   VALUE="MAXDB"/>
         <ITEM NAME="MSSQL" 		   VALUE="MSSQL"/>
@@ -111,7 +108,7 @@
 	<PARAMETER NAME="USE_EXISTING_CONNECTION" FIELD="CHECK" NUM_ROW="30"
 		SHOW_IF="(DBTYPE=='MSSQL') or (DBTYPE=='MYSQL') or (DBTYPE=='DBORACLE') or (DBTYPE=='POSTGRE')
 				or (DBTYPE=='POSTGREPLUS') or (DBTYPE=='TERADATA') or (DBTYPE=='NETEZZA') or (DBTYPE=='AS400')
-				or (DBTYPE=='DB2') or (DBTYPE=='FIREBIRD') or (DBTYPE=='INFORMIX') or (DBTYPE=='INGRES') or (DBTYPE=='INTERBASE')
+				or (DBTYPE=='DB2') or (DBTYPE=='FIREBIRD') or (DBTYPE=='INFORMIX')
 				or (DBTYPE=='SQLITE') or (DBTYPE=='SYBASE') or (DBTYPE=='ACCESS') or (DBTYPE=='GREENPLUM') or (DBTYPE=='VERTICA') 
 				or (DBTYPE=='EXASOL') or (DBTYPE=='REDSHIFT') or (DBTYPE=='SNOWFLAKE')">
 		<DEFAULT>false</DEFAULT>
@@ -126,7 +123,6 @@
 					or (DBTYPE=='TERADATA' and USE_EXISTING_CONNECTION=='TRUE') or (DBTYPE=='NETEZZA' and USE_EXISTING_CONNECTION=='TRUE')
 					or (DBTYPE=='AS400' and USE_EXISTING_CONNECTION=='TRUE') or (DBTYPE=='DB2' and USE_EXISTING_CONNECTION=='TRUE')
 					or (DBTYPE=='FIREBIRD' and USE_EXISTING_CONNECTION=='TRUE') or (DBTYPE=='INFORMIX' and USE_EXISTING_CONNECTION=='TRUE')
-					or (DBTYPE=='INGRES' and USE_EXISTING_CONNECTION == 'true') or (DBTYPE=='INTERBASE' and USE_EXISTING_CONNECTION == 'true')
 					or (DBTYPE=='SYBASE' and USE_EXISTING_CONNECTION == 'true') or  (DBTYPE == 'DBORACLE' AND (CONNECTION_TYPE == 'ORACLE_OCI'
 				    or CONNECTION_TYPE == 'ORACLE_WALLET' or CONNECTION_TYPE == 'ORACLE_RAC')) or (DBTYPE=='GREENPLUM' and USE_EXISTING_CONNECTION == 'true')
 				    or (DBTYPE=='VERTICA' and USE_EXISTING_CONNECTION == 'true') or (DBTYPE=='EXASOL' and USE_EXISTING_CONNECTION == 'true')
@@ -136,13 +132,13 @@
 	
 	<PARAMETER NAME="DBNAME" FIELD="TEXT" NUM_ROW="70"
 		REPOSITORY_VALUE="SID" REQUIRED="true"
-		NOT_SHOW_IF="(DBTYPE=='FIREBIRD') or (DBTYPE=='ACCESS') or (DBTYPE=='SQLITE') or (DBTYPE == 'INTERBASE') or (DBTYPE == 'HSQLDB')
+		NOT_SHOW_IF="(DBTYPE=='FIREBIRD') or (DBTYPE=='ACCESS') or (DBTYPE=='SQLITE') or (DBTYPE == 'HSQLDB')
 					or (DBTYPE == 'JAVADB') or (DBTYPE == 'ODBC') or (DBTYPE=='MYSQL' and USE_EXISTING_CONNECTION=='TRUE')
 					or (DBTYPE=='MSSQL' and USE_EXISTING_CONNECTION == 'true') or (DBTYPE=='DBORACLE' and USE_EXISTING_CONNECTION=='TRUE')
 					or (DBTYPE=='POSTGRE' and USE_EXISTING_CONNECTION=='TRUE') or (DBTYPE=='POSTGREPLUS' and USE_EXISTING_CONNECTION=='TRUE')
 					or (DBTYPE=='TERADATA' and USE_EXISTING_CONNECTION=='TRUE') or (DBTYPE=='NETEZZA' and USE_EXISTING_CONNECTION=='TRUE')
 					or (DBTYPE=='AS400' and USE_EXISTING_CONNECTION=='TRUE') or (DBTYPE=='DB2' and USE_EXISTING_CONNECTION=='TRUE')
-					or (DBTYPE=='INFORMIX' and USE_EXISTING_CONNECTION=='TRUE') or (DBTYPE=='INGRES' and USE_EXISTING_CONNECTION == 'true')
+					or (DBTYPE=='INFORMIX' and USE_EXISTING_CONNECTION=='TRUE')
 					or (DBTYPE=='SYBASE' and USE_EXISTING_CONNECTION == 'true') or  (DBTYPE == 'DBORACLE' AND (CONNECTION_TYPE == 'ORACLE_OCI'
 				    or CONNECTION_TYPE == 'ORACLE_WALLET' or CONNECTION_TYPE == 'ORACLE_RAC')) or (DBTYPE=='GREENPLUM' and USE_EXISTING_CONNECTION == 'true')
 				    or (DBTYPE=='VERTICA' and USE_EXISTING_CONNECTION == 'true')
@@ -178,8 +174,8 @@
 					or (DBTYPE=='POSTGREPLUS' and USE_EXISTING_CONNECTION=='TRUE') or (DBTYPE=='TERADATA' and USE_EXISTING_CONNECTION=='TRUE')
 					or (DBTYPE=='NETEZZA' and USE_EXISTING_CONNECTION=='TRUE') or (DBTYPE=='AS400' and USE_EXISTING_CONNECTION=='TRUE')
 					or (DBTYPE=='DB2' and USE_EXISTING_CONNECTION=='TRUE') or (DBTYPE=='FIREBIRD' and USE_EXISTING_CONNECTION=='TRUE')
-					or (DBTYPE=='INFORMIX' and USE_EXISTING_CONNECTION=='TRUE') or (DBTYPE=='INGRES' and USE_EXISTING_CONNECTION == 'true')
-					or (DBTYPE=='INTERBASE' and USE_EXISTING_CONNECTION == 'true') or (DBTYPE=='SYBASE' and USE_EXISTING_CONNECTION == 'true')
+					or (DBTYPE=='INFORMIX' and USE_EXISTING_CONNECTION=='TRUE')
+					or (DBTYPE=='SYBASE' and USE_EXISTING_CONNECTION == 'true')
 					or (DBTYPE=='ACCESS' and USE_EXISTING_CONNECTION == 'true') or (DBTYPE == 'DBORACLE' and CONNECTION_TYPE == 'ORACLE_WALLET')
 					or (DBTYPE=='GREENPLUM' and USE_EXISTING_CONNECTION == 'true') or (DBTYPE=='VERTICA' and USE_EXISTING_CONNECTION == 'true')
 					or (DBTYPE=='EXASOL' and USE_EXISTING_CONNECTION == 'true')
@@ -194,8 +190,8 @@
 					or (DBTYPE=='POSTGREPLUS' and USE_EXISTING_CONNECTION=='TRUE') or (DBTYPE=='TERADATA' and USE_EXISTING_CONNECTION=='TRUE')
 					or (DBTYPE=='NETEZZA' and USE_EXISTING_CONNECTION=='TRUE') or (DBTYPE=='AS400' and USE_EXISTING_CONNECTION=='TRUE')
 					or (DBTYPE=='DB2' and USE_EXISTING_CONNECTION=='TRUE') or (DBTYPE=='FIREBIRD' and USE_EXISTING_CONNECTION=='TRUE')
-					or (DBTYPE=='INFORMIX' and USE_EXISTING_CONNECTION=='TRUE') or (DBTYPE=='INGRES' and USE_EXISTING_CONNECTION == 'true')
-					or (DBTYPE=='INTERBASE' and USE_EXISTING_CONNECTION == 'true') or (DBTYPE=='SYBASE' and USE_EXISTING_CONNECTION == 'true')
+					or (DBTYPE=='INFORMIX' and USE_EXISTING_CONNECTION=='TRUE')
+					or (DBTYPE=='SYBASE' and USE_EXISTING_CONNECTION == 'true')
 					or (DBTYPE=='ACCESS' and USE_EXISTING_CONNECTION == 'true') or (DBTYPE == 'DBORACLE' and CONNECTION_TYPE == 'ORACLE_WALLET')
 					or (DBTYPE=='GREENPLUM' and USE_EXISTING_CONNECTION == 'true') or (DBTYPE=='VERTICA' and USE_EXISTING_CONNECTION == 'true')
 					or (DBTYPE=='EXASOL' and USE_EXISTING_CONNECTION == 'true')
@@ -213,10 +209,10 @@
 	  				or (DBTYPE=='MSSQL' and USE_EXISTING_CONNECTION == 'true') or (DBTYPE=='MYSQL' and USE_EXISTING_CONNECTION=='TRUE')
 	  				or (DBTYPE=='DBORACLE' and USE_EXISTING_CONNECTION=='TRUE') or (DBTYPE=='NETEZZA' and USE_EXISTING_CONNECTION=='TRUE')
 	  				or (DBTYPE=='POSTGRE' and USE_EXISTING_CONNECTION=='TRUE') or (DBTYPE=='POSTGREPLUS' and USE_EXISTING_CONNECTION=='TRUE')
-	  				or (DBTYPE == 'JAVADB' and FRAMEWORK_TYPE=='EMBEDED') or (DBTYPE == 'ODBC') or (DBTYPE == 'INTERBASE')
+	  				or (DBTYPE == 'JAVADB' and FRAMEWORK_TYPE=='EMBEDED') or (DBTYPE == 'ODBC')
 	  				or (DBTYPE == 'HSQLDB' and RUNNING_MODE == 'HSQLDB_INPROGRESS_PERSISTENT')
 	  				or (DBTYPE=='DB2' and USE_EXISTING_CONNECTION=='TRUE') or (DBTYPE=='INFORMIX' and USE_EXISTING_CONNECTION=='TRUE')
-	  				or (DBTYPE=='INGRES' and USE_EXISTING_CONNECTION == 'true') or (DBTYPE=='SYBASE' and USE_EXISTING_CONNECTION == 'true')
+	  				or (DBTYPE=='SYBASE' and USE_EXISTING_CONNECTION == 'true')
 					or (DBTYPE == 'DBORACLE' and (CONNECTION_TYPE == 'ORACLE_OCI' or CONNECTION_TYPE == 'ORACLE_WALLET' or CONNECTION_TYPE == 'ORACLE_RAC'))
 					or (DBTYPE=='GREENPLUM' and USE_EXISTING_CONNECTION == 'true') or (DBTYPE=='VERTICA' and USE_EXISTING_CONNECTION == 'true')
 					or (DBTYPE=='EXASOL' and USE_EXISTING_CONNECTION == 'true')
@@ -256,8 +252,6 @@
 	<PARAMETER NAME="DB_AS400_VERSION" FIELD="CLOSED_LIST" NUM_ROW="50"
 			REPOSITORY_VALUE="DB_VERSION" SHOW_IF="(DBTYPE=='AS400' and USE_EXISTING_CONNECTION=='FALSE')">
 			<ITEMS DEFAULT="V7R1_V7R3">
-				<ITEM NAME="V5R2_V5R4" VALUE="jt400_V5R2.jar"/>
-				<ITEM NAME="V5R3_V6R1" VALUE="jt400_V5R3.jar"/>
                 <ITEM NAME="V6R1_V7R2" VALUE="jt400_V6R1.jar"/>
                 <ITEM NAME="V7R1_V7R3" VALUE="jt400-9.8.jar" />
 			</ITEMS>
@@ -364,32 +358,6 @@
     </PARAMETER>
 	<!--Informix configuration end-->
 
-	<!--Ingres configuration start-->
-	<PARAMETER
-      NAME="CONNECTION_INGRES"
-      FIELD="COMPONENT_LIST"
-      FILTER="tIngresConnection"
-	  REQUIRED="true"
-      NUM_ROW="30"
-      SHOW_IF="(DBTYPE=='INGRES') and (USE_EXISTING_CONNECTION == 'true')"
-    />
-	<!--Ingres configuration end-->
-
-	<!--Interbase configuration start-->
-	<PARAMETER
-      NAME="CONNECTION_INTERBASE"
-      FIELD="COMPONENT_LIST"
-      FILTER="tInterbaseConnection"
-	  REQUIRED="true"
-      NUM_ROW="30"
-      SHOW_IF="(DBTYPE=='INTERBASE') and (USE_EXISTING_CONNECTION == 'true')"
-    />
-	<PARAMETER NAME="DBFILE_INTERBASE" FIELD="TEXT" NUM_ROW="40"
-		REQUIRED="true" REPOSITORY_VALUE="SID" SHOW_IF="(DBTYPE=='INTERBASE' and (USE_EXISTING_CONNECTION == 'false'))">
-		<DEFAULT>"__COMP_DEFAULT_FILE_DIR__/in.gdb"</DEFAULT>
-	</PARAMETER>
-	<!--Interbase configuration end-->
-
 	<!--JavaDb configuration start-->
 	<PARAMETER NAME="FRAMEWORK_TYPE" FIELD="CLOSED_LIST" NUM_ROW="30"
 		REPOSITORY_VALUE="FRAMEWORK_TYPE" SHOW_IF="(DBTYPE=='JAVADB')">
@@ -656,16 +624,6 @@
 		REPOSITORY_VALUE="DB_VERSION"
 		SHOW_IF="(DBTYPE=='VERTICA') and (USE_EXISTING_CONNECTION == 'false')">
 		<ITEMS DEFAULT="VERTICA_9_0">
-			<ITEM NAME="VERTICA_3" VALUE="VERTICA_3" />
-			<ITEM NAME="VERTICA_3.5" VALUE="VERTICA_3.5" />
-			<ITEM NAME="VERTICA_4" VALUE="VERTICA_4" />
-			<ITEM NAME="VERTICA_4.1" VALUE="VERTICA_4_1" />
-			<ITEM NAME="VERTICA_5.0" VALUE="VERTICA_5" />
-			<ITEM NAME="VERTICA_5_1" VALUE="VERTICA_5_1" />
-			<ITEM NAME="VERTICA_6_0" VALUE="VERTICA_6_0" />
-			<ITEM NAME="VERTICA_6_1_X" VALUE="VERTICA_6_1_X" />
-			<ITEM NAME="VERTICA_7_0_X" VALUE="VERTICA_7_0_X" />
-			<ITEM NAME="VERTICA_7_1_X" VALUE="VERTICA_7_1_X" />
 			<ITEM NAME="VERTICA_9_0" VALUE="VERTICA_9_0" />
 		</ITEMS>
 	</PARAMETER>
@@ -761,8 +719,6 @@
       <DEFAULT IF="DBTYPE=='FIREBIRD'">firebird_id</DEFAULT>
       <DEFAULT IF="DBTYPE=='HSQLDB'">hsqldb_id</DEFAULT>
       <DEFAULT IF="DBTYPE=='INFORMIX'">informix_id</DEFAULT>
-      <DEFAULT IF="DBTYPE=='INGRES'">ingres_id</DEFAULT>
-      <DEFAULT IF="DBTYPE=='INTERBASE'">interbase_id</DEFAULT>
       <DEFAULT IF="DBTYPE=='JAVADB'">javadb_id</DEFAULT>
       <DEFAULT IF="DBTYPE=='MAXDB'">maxdb_id</DEFAULT>
       <DEFAULT IF="DBTYPE=='MSSQL'">id_MSSQL</DEFAULT>
@@ -850,8 +806,6 @@
 
    <CODEGENERATION>
      <IMPORTS>
-        <IMPORT NAME="Driver-V5R2_V5R4" MODULE="jt400_V5R2.jar" MVN="mvn:org.talend.libraries/jt400_V5R2/6.0.0"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') and (DBTYPE=='AS400') and (DB_AS400_VERSION=='jt400_V5R2.jar')"/>
-        <IMPORT NAME="Driver-V5R3_V6R1" MODULE="jt400_V5R3.jar" MVN="mvn:org.talend.libraries/jt400_V5R3/6.0.0"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') and (DBTYPE=='AS400') and (DB_AS400_VERSION=='jt400_V5R3.jar')"/>
         <IMPORT NAME="Driver-V6R1_V7R2" MODULE="jt400_V6R1.jar" MVN="mvn:org.talend.libraries/jt400_V6R1/6.0.0"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') and (DBTYPE=='AS400') and (DB_AS400_VERSION=='jt400_V6R1.jar')" />
         <IMPORT NAME="Driver-V7R1_V7R3" MODULE="jt400-9.8.jar" MVN="mvn:net.sf.jt400/jt400/9.8"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') and (DBTYPE=='AS400') and (DB_AS400_VERSION=='jt400-9.8.jar')" />
 		<IMPORT NAME="Driver-DB2" MODULE="db2jcc4.jar" MVN="mvn:org.talend.libraries/db2jcc4/6.0.0"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='DB2')" />
@@ -860,11 +814,12 @@
 		<IMPORT NAME="Driver_MaxDB" MODULE="sapdbc.jar" MVN="mvn:org.talend.libraries/sapdbc/6.0.0"  REQUIRED_IF="DBTYPE=='MAXDB'" />
 		<IMPORT NAME="Driver-MSSQL" MODULE="jtds-1.3.1-patch-20190523.jar" MVN="mvn:net.sourceforge.jtds/jtds/1.3.1-patch-20190523" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='JTDS')" />
 		<IMPORT NAME="Driver-MSSQL-prop" MODULE="mssql-jdbc.jar" MVN="mvn:org.talend.libraries/mssql-jdbc/6.0.0"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP')" />
-		<IMPORT NAME="adal4j" MODULE="adal4j-1.6.5.jar" MVN="mvn:com.microsoft.azure/adal4j/1.6.5"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP') AND (MSSQL_ACTIVE_DIR_AUTH == 'true')" />
+		<IMPORT NAME="adal4j" MODULE="adal4j-1.6.7.jar" MVN="mvn:com.microsoft.azure/adal4j/1.6.7"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP') AND (MSSQL_ACTIVE_DIR_AUTH == 'true')" />
 		<IMPORT NAME="commons-lang3" MODULE="commons-lang3-3.10.jar" MVN="mvn:org.apache.commons/commons-lang3/3.10"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP') AND (MSSQL_ACTIVE_DIR_AUTH == 'true')" />
 		<IMPORT NAME="commons-codec" MODULE="commons-codec-1.14.jar" MVN="mvn:commons-codec/commons-codec/1.14"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP') AND (MSSQL_ACTIVE_DIR_AUTH == 'true')" />
 		<IMPORT NAME="gson" MODULE="gson-2.8.6.jar" MVN="mvn:com.google.code.gson/gson/2.8.6"  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-6.5.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/6.5"  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="content-type" MODULE="content-type-2.1.jar" MVN="mvn:com.nimbusds/content-type/2.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')" />
 		<IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-8.11.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/8.11"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP') AND (MSSQL_ACTIVE_DIR_AUTH == 'true')" />
 		<IMPORT NAME="javax.mail" MODULE="javax.mail-1.6.2.jar" MVN="mvn:com.sun.mail/javax.mail/1.6.2"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP') AND (MSSQL_ACTIVE_DIR_AUTH == 'true')" />
@@ -887,8 +842,6 @@
 		<IMPORT NAME="Driver-INFORMIX-LSUPP" MODULE="ifxlsupp.jar" MVN="mvn:org.talend.libraries/ifxlsupp/6.0.0"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='INFORMIX')" />
 		<IMPORT NAME="Driver-INFORMIX-SQLJ" MODULE="ifxsqlj.jar" MVN="mvn:org.talend.libraries/ifxsqlj/6.0.0"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='INFORMIX')" />
 		<IMPORT NAME="Driver-INFORMIX-TOOLS" MODULE="ifxtools.jar" MVN="mvn:org.talend.libraries/ifxtools/6.0.0"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='INFORMIX')"/>
-		<IMPORT NAME="Driver-INGRES" MODULE="iijdbc.jar" MVN="mvn:org.talend.libraries/iijdbc/6.0.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='INGRES')"/>
-		<IMPORT NAME="Driver-Interbase" MODULE="interclient.jar" MVN="mvn:org.talend.libraries/interclient/6.0.0"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='INTERBASE')" />
 		<IMPORT NAME="Driver-JAVADB-DERBY" MODULE="derby.jar" MVN="mvn:org.talend.libraries/derby/6.0.0" REQUIRED_IF="DBTYPE=='JAVADB'"/>
 		<IMPORT NAME="Driver-JAVADB-DERBYCLIENT" MODULE="derbyclient.jar" MVN="mvn:org.talend.libraries/derbyclient/6.0.0" REQUIRED_IF="DBTYPE=='JAVADB'"/>
 		<IMPORT NAME="Driver-JAVADB-DERBYNET" MODULE="derbynet.jar" MVN="mvn:org.talend.libraries/derbynet/6.0.0" REQUIRED_IF="DBTYPE=='JAVADB'"/>
@@ -900,16 +853,6 @@
 		<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-VERTICA" MODULE="vertica_3.0_jdk_5.jar" MVN="mvn:org.talend.libraries/vertica_3.0_jdk_5/6.0.0"   			REQUIRED_IF="(DBTYPE=='VERTICA') and (USE_EXISTING_CONNECTION == 'false') and (DB_VERTICA_VERSION=='VERTICA_3')" />
-		<IMPORT NAME="Driver-VERTICA_3.5" MODULE="vertica_3.5_jdk_5.jar" MVN="mvn:org.talend.libraries/vertica_3.5_jdk_5/6.0.0"   		REQUIRED_IF="(DBTYPE=='VERTICA') and (USE_EXISTING_CONNECTION == 'false') and (DB_VERTICA_VERSION=='VERTICA_3.5')" />
-		<IMPORT NAME="Driver-VERTICA_4" MODULE="vertica_4.0_jdk_5.jar" MVN="mvn:org.talend.libraries/vertica_4.0_jdk_5/6.0.0"   		REQUIRED_IF="(DBTYPE=='VERTICA') and (USE_EXISTING_CONNECTION == 'false') and (DB_VERTICA_VERSION=='VERTICA_4')" />
-		<IMPORT NAME="Driver-VERTICA_4.1" MODULE="vertica_4.1.7_jdk_5.jar" MVN="mvn:org.talend.libraries/vertica_4.1.7_jdk_5/6.0.0"   	REQUIRED_IF="(DBTYPE=='VERTICA') and (USE_EXISTING_CONNECTION == 'false') and (DB_VERTICA_VERSION=='VERTICA_4.1')" />
-		<IMPORT NAME="Driver-VERTICA_5.0" MODULE="vertica_4.1.14_jdk_5.jar" MVN="mvn:org.talend.libraries/vertica_4.1.14_jdk_5/6.0.0"   REQUIRED_IF="(DBTYPE=='VERTICA') and (USE_EXISTING_CONNECTION == 'false') and (DB_VERTICA_VERSION=='VERTICA_5.0')" />
-		<IMPORT NAME="Driver-VERTICA_5.1" MODULE="vertica_5.1.6_jdk_5.jar" MVN="mvn:org.talend.libraries/vertica_5.1.6_jdk_5/6.0.0"   	REQUIRED_IF="(DBTYPE=='VERTICA') and (USE_EXISTING_CONNECTION == 'false') and (DB_VERTICA_VERSION=='VERTICA_5_1')" />
-		<IMPORT NAME="Driver-VERTICA_6.0" MODULE="vertica-jdk5-6.0.2-0.jar" MVN="mvn:org.talend.libraries/vertica-jdk5-6.0.2-0/6.0.0"   REQUIRED_IF="(DBTYPE=='VERTICA') and (USE_EXISTING_CONNECTION == 'false') and (DB_VERTICA_VERSION=='VERTICA_6_0')" />
-		<IMPORT NAME="Driver-VERTICA_6.1.2" MODULE="vertica-jdk5-6.1.2-0.jar" MVN="mvn:org.talend.libraries/vertica-jdk5-6.1.2-0/6.0.0"   REQUIRED_IF="(DBTYPE=='VERTICA') and (USE_EXISTING_CONNECTION == 'false') and (DB_VERTICA_VERSION=='VERTICA_6_1_X')" />
-		<IMPORT NAME="Driver-VERTICA_7.0.1" MODULE="vertica-jdbc-7.0.1-0.jar" MVN="mvn:org.talend.libraries/vertica-jdbc-7.0.1-0/6.0.0"   REQUIRED_IF="(DBTYPE=='VERTICA') and (USE_EXISTING_CONNECTION == 'false') and (DB_VERTICA_VERSION=='VERTICA_7_0_X')" />
-  		<IMPORT NAME="Driver-VERTICA_7.1.2" MODULE="vertica-jdbc-7.1.2-0.jar" MVN="mvn:org.talend.libraries/vertica-jdbc-7.1.2-0/6.0.0" REQUIRED_IF="(DBTYPE=='VERTICA') and (USE_EXISTING_CONNECTION == 'false') and (DB_VERTICA_VERSION=='VERTICA_7_1_X')" />
   		<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" MODULE="redshift-jdbc42-no-awssdk-1.2.37.1061.jar" MVN="mvn:com.amazon.redshift/redshift-jdbc42-no-awssdk/1.2.37.1061" REQUIRED_IF="(DBTYPE=='REDSHIFT') and (USE_EXISTING_CONNECTION == 'false')" />
 		<IMPORT NAME="Driver-Snowflake" MODULE="snowflake-jdbc-3.12.11.jar" MVN="mvn:net.snowflake/snowflake-jdbc/3.12.11"  REQUIRED_IF="(DBTYPE=='SNOWFLAKE') and (USE_EXISTING_CONNECTION == 'false')" />

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

@@ -89,26 +89,13 @@ DB_VERSION.ITEM.ORACLE_10=Oracle 10
 DB_VERSION.ITEM.ORACLE_9=Oracle 9
 DB_VERSION.ITEM.ORACLE_8=Oracle 8
 DB_AS400_VERSION.NAME=DB Version
-DB_AS400_VERSION.ITEM.V5R2_V5R4=V5R2 to V5R4
-DB_AS400_VERSION.ITEM.V5R3_V6R1=V5R3 to V6R1
 DB_AS400_VERSION.ITEM.V6R1_V7R2=V6R1 to V7R2
 DB_AS400_VERSION.ITEM.V7R1_V7R3=V7R1 to V7R3
 DB_MYSQL_VERSION.NAME=DB Version
-DB_MYSQL_VERSION.ITEM.MYSQL_4=Mysql 4(Deprecated)
 DB_MYSQL_VERSION.ITEM.MYSQL_5=Mysql 5
 DB_MYSQL_VERSION.ITEM.MYSQL_8=Mysql 8
 DB_MYSQL_VERSION.ITEM.MARIADB=MariaDB
 DB_VERTICA_VERSION.NAME=DB Version
-DB_VERTICA_VERSION.ITEM.VERTICA_3=Vertica 3 (Deprecated)
-DB_VERTICA_VERSION.ITEM.VERTICA_3.5=Vertica 3.5 (Deprecated)
-DB_VERTICA_VERSION.ITEM.VERTICA_4=Vertica 4 (Deprecated)
-DB_VERTICA_VERSION.ITEM.VERTICA_4.1=Vertica 4.1 (Deprecated)
-DB_VERTICA_VERSION.ITEM.VERTICA_5.0=Vertica 5.0 (Deprecated)
-DB_VERTICA_VERSION.ITEM.VERTICA_5_1=Vertica 5.1 (Deprecated)
-DB_VERTICA_VERSION.ITEM.VERTICA_6_0=Vertica 6.0 (Deprecated)
-DB_VERTICA_VERSION.ITEM.VERTICA_6_1_X=Vertica 6.1.X (Deprecated)
-DB_VERTICA_VERSION.ITEM.VERTICA_7_0_X=Vertica 7.0.X (Deprecated)
-DB_VERTICA_VERSION.ITEM.VERTICA_7_1_X=Vertica 7.1.X (Deprecated)
 DB_VERTICA_VERSION.ITEM.VERTICA_9_0=Vertica 9
 DB_POSTGRE_VERSION.NAME=DB Version
 DB_POSTGRE_VERSION.ITEM.PRIOR_TO_V9=Prior to v9

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

@@ -89,26 +89,13 @@ DB_VERSION.ITEM.ORACLE_10=Oracle 10
 DB_VERSION.ITEM.ORACLE_9=Oracle 9
 DB_VERSION.ITEM.ORACLE_8=Oracle 8
 DB_AS400_VERSION.NAME=Version de la base de donn\u00E9es
-DB_AS400_VERSION.ITEM.V5R2_V5R4=V5R2 \u00E0 V5R4
-DB_AS400_VERSION.ITEM.V5R3_V6R1=V5R3 \u00E0 V6R1
 DB_AS400_VERSION.ITEM.V6R1_V7R2=V6R1 \u00E0 V7R2
 DB_AS400_VERSION.ITEM.V7R1_V7R3=V7R1 \u00E0 V7R3
 DB_MYSQL_VERSION.NAME=Version de la base de donn\u00E9es
-DB_MYSQL_VERSION.ITEM.MYSQL_4=Mysql 4 (D\u00E9pr\u00E9ci\u00E9)
 DB_MYSQL_VERSION.ITEM.MYSQL_5=MySQL 5
 DB_MYSQL_VERSION.ITEM.MYSQL_8=MySQL 8
 DB_MYSQL_VERSION.ITEM.MARIADB=MariaDB
 DB_VERTICA_VERSION.NAME=Version de la base de donn\u00E9es
-DB_VERTICA_VERSION.ITEM.VERTICA_3=Vertica 3 (D\u00E9pr\u00E9ci\u00E9e)
-DB_VERTICA_VERSION.ITEM.VERTICA_3.5=Vertica 3.5 (D\u00E9pr\u00E9ci\u00E9e)
-DB_VERTICA_VERSION.ITEM.VERTICA_4=Vertica 4 (D\u00E9pr\u00E9ci\u00E9e)
-DB_VERTICA_VERSION.ITEM.VERTICA_4.1=Vertica 4.1 (D\u00E9pr\u00E9ci\u00E9e)
-DB_VERTICA_VERSION.ITEM.VERTICA_5.0=Vertica 5.0 (D\u00E9pr\u00E9ci\u00E9e)
-DB_VERTICA_VERSION.ITEM.VERTICA_5_1=Vertica 5.1 (D\u00E9pr\u00E9ci\u00E9e)
-DB_VERTICA_VERSION.ITEM.VERTICA_6_0=Vertica 6.0 (D\u00E9pr\u00E9ci\u00E9e)
-DB_VERTICA_VERSION.ITEM.VERTICA_6_1_X=Vertica 6.1.X (D\u00E9pr\u00E9ci\u00E9e)
-DB_VERTICA_VERSION.ITEM.VERTICA_7_0_X=Vertica 7.0.X (D\u00E9pr\u00E9ci\u00E9e)
-DB_VERTICA_VERSION.ITEM.VERTICA_7_1_X=Vertica 7.1.X (D\u00E9pr\u00E9ci\u00E9e)
 DB_VERTICA_VERSION.ITEM.VERTICA_9_0=Vertica 9
 DB_POSTGRE_VERSION.NAME=Version de la base de donn\u00E9es
 DB_POSTGRE_VERSION.ITEM.PRIOR_TO_V9=Ant\u00E9rieure \u00E0 la v9

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

@@ -89,26 +89,13 @@ DB_VERSION.ITEM.ORACLE_10=Oracle 10
 DB_VERSION.ITEM.ORACLE_9=Oracle 9
 DB_VERSION.ITEM.ORACLE_8=Oracle 8
 DB_AS400_VERSION.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30D0\u30FC\u30B8\u30E7\u30F3
-DB_AS400_VERSION.ITEM.V5R2_V5R4=V5R4\u306BV5R2
-DB_AS400_VERSION.ITEM.V5R3_V6R1=V6R1\u306BV5R3
 DB_AS400_VERSION.ITEM.V6R1_V7R2=V6R1\u304B\u3089V7R2
 DB_AS400_VERSION.ITEM.V7R1_V7R3=V7R1\u304B\u3089V7R3
 DB_MYSQL_VERSION.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30D0\u30FC\u30B8\u30E7\u30F3
-DB_MYSQL_VERSION.ITEM.MYSQL_4=Mysql 4 (\u975E\u63A8\u5968)
 DB_MYSQL_VERSION.ITEM.MYSQL_5=Mysql 5
 DB_MYSQL_VERSION.ITEM.MYSQL_8=Mysql8
 DB_MYSQL_VERSION.ITEM.MARIADB=MariaDB
 DB_VERTICA_VERSION.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30D0\u30FC\u30B8\u30E7\u30F3
-DB_VERTICA_VERSION.ITEM.VERTICA_3=Vertica 3 (\u975E\u63A8\u5968)
-DB_VERTICA_VERSION.ITEM.VERTICA_3.5=Vertica 3.5 (\u975E\u63A8\u5968)
-DB_VERTICA_VERSION.ITEM.VERTICA_4=Vertica 4 (\u975E\u63A8\u5968)
-DB_VERTICA_VERSION.ITEM.VERTICA_4.1=Vertica 4.1 (\u975E\u63A8\u5968)
-DB_VERTICA_VERSION.ITEM.VERTICA_5.0=Vertica 5.0 (\u975E\u63A8\u5968)
-DB_VERTICA_VERSION.ITEM.VERTICA_5_1=Vertica 5.1 (\u975E\u63A8\u5968)
-DB_VERTICA_VERSION.ITEM.VERTICA_6_0=Vertica 6.0 (\u975E\u63A8\u5968)
-DB_VERTICA_VERSION.ITEM.VERTICA_6_1_X=Vertica 6.1.X (\u975E\u63A8\u5968)
-DB_VERTICA_VERSION.ITEM.VERTICA_7_0_X=Vertica 7.0.X (\u975E\u63A8\u5968)
-DB_VERTICA_VERSION.ITEM.VERTICA_7_1_X=Vertica 7.1.X (\u975E\u63A8\u5968)
 DB_VERTICA_VERSION.ITEM.VERTICA_9_0=Vertica 9
 DB_POSTGRE_VERSION.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30D0\u30FC\u30B8\u30E7\u30F3
 DB_POSTGRE_VERSION.ITEM.PRIOR_TO_V9=v9\u4EE5\u524D

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

@@ -89,26 +89,13 @@ DB_VERSION.ITEM.ORACLE_10=Oracle 10
 DB_VERSION.ITEM.ORACLE_9=Oracle 9
 DB_VERSION.ITEM.ORACLE_8=Oracle 8
 DB_AS400_VERSION.NAME=\u6570\u636E\u5E93\u7248\u672C
-DB_AS400_VERSION.ITEM.V5R2_V5R4=V5R2 \u81F3 V5R4
-DB_AS400_VERSION.ITEM.V5R3_V6R1=V5R3 \u81F3 V6R1
 DB_AS400_VERSION.ITEM.V6R1_V7R2=V6R1 \u81F3 V7R2
 DB_AS400_VERSION.ITEM.V7R1_V7R3=V7R1 \u5230 V7R3
 DB_MYSQL_VERSION.NAME=\u6570\u636E\u5E93\u7248\u672C
-DB_MYSQL_VERSION.ITEM.MYSQL_4=Mysql 4 (\u5DF2\u5F03\u7528)
 DB_MYSQL_VERSION.ITEM.MYSQL_5=Mysql 5
 DB_MYSQL_VERSION.ITEM.MYSQL_8=Mysql 8
 DB_MYSQL_VERSION.ITEM.MARIADB=MariaDB
 DB_VERTICA_VERSION.NAME=\u6570\u636E\u5E93\u7248\u672C
-DB_VERTICA_VERSION.ITEM.VERTICA_3=Vertica 3 (\u5DF2\u5F03\u7528)
-DB_VERTICA_VERSION.ITEM.VERTICA_3.5=Vertica 3.5 (\u5DF2\u5F03\u7528)
-DB_VERTICA_VERSION.ITEM.VERTICA_4=Vertica 4 (\u5DF2\u5F03\u7528)
-DB_VERTICA_VERSION.ITEM.VERTICA_4.1=Vertica 4.1 (\u5DF2\u5F03\u7528)
-DB_VERTICA_VERSION.ITEM.VERTICA_5.0=Vertica 5.0 (\u5DF2\u5F03\u7528)
-DB_VERTICA_VERSION.ITEM.VERTICA_5_1=Vertica 5.1 (\u5DF2\u5F03\u7528)
-DB_VERTICA_VERSION.ITEM.VERTICA_6_0=Vertica 6.0 (\u5DF2\u5F03\u7528)
-DB_VERTICA_VERSION.ITEM.VERTICA_6_1_X=Vertica 6.1.X (\u5DF2\u5F03\u7528)
-DB_VERTICA_VERSION.ITEM.VERTICA_7_0_X=Vertica 7.0.X (\u5DF2\u5F03\u7528)
-DB_VERTICA_VERSION.ITEM.VERTICA_7_1_X=Vertica 7.1.X (\u5DF2\u5F03\u7528)
 DB_VERTICA_VERSION.ITEM.VERTICA_9_0=Vertica 9
 DB_POSTGRE_VERSION.NAME=\u6570\u636E\u5E93\u7248\u672C
 DB_POSTGRE_VERSION.ITEM.PRIOR_TO_V9=v9 \u4E4B\u524D\u7248\u672C

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

@@ -25,7 +25,7 @@ TABLE_ACTION.ITEM.DROP_CREATE=\u30C9\u30ED\u30C3\u30D7\u3057\u3066\u30C6\u30FC\u
 TABLE_ACTION.ITEM.NONE=\u30C7\u30D5\u30A9\u30EB\u30C8
 TABLE_ACTION.NAME=\u30C6\u30FC\u30D6\u30EB\u306E\u64CD\u4F5C
 USER.NAME=\u30E6\u30FC\u30B6\u30FC\u540D
-USE_FIELD_OPTIONS.NAME=\u30D5\u30A3\u30FC\u30EB\u30C9\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u4F7F\u7528
+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=\u66F4\u65B0\u30AD\u30FC
 FIELD_OPTIONS.ITEM.DELETE_KEY=\u524A\u9664\u30AD\u30FC

main/plugins/org.talend.designer.components.localprovider/components/tDB2Connection/tDB2Connection_java.xml

@@ -191,8 +191,8 @@
 		<IMPORT NAME="Driver-DB2" MODULE="db2jcc4.jar" MVN="mvn:org.talend.libraries/db2jcc4/6.0.0"  REQUIRED="true" />
 		<IMPORT NAME="Driver-DB2" MODULE="db2jcc_license_cu.jar" MVN="mvn:org.talend.libraries/db2jcc_license_cu/6.0.0"  REQUIRED="true" />
 		<IMPORT NAME="Driver-DB2" MODULE="db2jcc_license_cisuz.jar" MVN="mvn:org.talend.libraries/db2jcc_license_cisuz/6.0.0"  REQUIRED="true" />
-		<IMPORT NAME="slf4j-api-1.7.25.jar" MODULE="slf4j-api-1.7.25.jar" MVN="mvn:org.slf4j/slf4j-api/1.7.25" REQUIRED_IF="(USE_SHARED_CONNECTION == 'true' AND SPECIFY_DATASOURCE_ALIAS=='false')" />
-		<IMPORT NAME="slf4j-log4j12-1.7.25.jar" MODULE="slf4j-log4j12-1.7.25.jar" MVN="mvn:org.slf4j/slf4j-log4j12/1.7.25" REQUIRED_IF="(USE_SHARED_CONNECTION == 'true' AND SPECIFY_DATASOURCE_ALIAS=='false')" />
+		<IMPORT NAME="slf4j-api-1.7.29.jar" MODULE="slf4j-api-1.7.29.jar" MVN="mvn:org.slf4j/slf4j-api/1.7.29" REQUIRED_IF="(USE_SHARED_CONNECTION == 'true' AND SPECIFY_DATASOURCE_ALIAS=='false')" />
+		<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')" />
      </IMPORTS>
    </CODEGENERATION>
 

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

@@ -62,7 +62,7 @@ TYPE.ITEM.ORACLE=Oracle
 TYPE.ITEM.PGSQL=
 TYPE.NAME=
 USER.NAME=\u30E6\u30FC\u30B6\u30FC\u540D
-USE_FIELD_OPTIONS.NAME=\u30D5\u30A3\u30FC\u30EB\u30C9\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u4F7F\u7528
+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=\u66F4\u65B0\u30AD\u30FC
 FIELD_OPTIONS.ITEM.DELETE_KEY=\u524A\u9664\u30AD\u30FC

main/plugins/org.talend.designer.components.localprovider/components/tDB2Row/tDB2Row_messages_ja.properties

@@ -27,7 +27,7 @@ TYPE.ITEM.PGSQL=
 TYPE.NAME=
 USER.NAME=\u30E6\u30FC\u30B6\u30FC\u540D
 PROPAGATE_RECORD_SET.NAME=QUERY\u306E\u30EC\u30B3\u30FC\u30C9\u30BB\u30C3\u30C8\u3092\u4F1D\u64AD
-RECORD_SET_COLUMN.NAME=\u30AB\u30E9\u30E0\u306E\u4F7F\u7528
+RECORD_SET_COLUMN.NAME=\u30AB\u30E9\u30E0\u3092\u4F7F\u7528
 USE_EXISTING_CONNECTION.NAME=\u65E2\u5B58\u306E\u63A5\u7D9A\u3092\u4F7F\u7528
 PREPARED_STATEMENT.NAME=\u6E96\u5099\u3055\u308C\u305F\u30B9\u30C6\u30FC\u30C8\u30E1\u30F3\u30C8
 STATEMENT_PARAMS.ITEM.INPUT_COLUMN=InputColumn
@@ -37,7 +37,7 @@ CONNECTION.NAME=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u30EA\u30B9\u30C8
 SCHEMA_FLOW.NAME=\u30B9\u30AD\u30FC\u30DE
 SCHEMA_REJECT.NAME=\u30B9\u30AD\u30FC\u30DE\u306E\u30EA\u30B8\u30A7\u30AF\u30C8
 QUERYSTORE.NAME=\u30AF\u30A8\u30EA\u30FC\u30BF\u30A4\u30D7
-USE_PREPAREDSTATEMENT.NAME=PreparedStatement\u3092\u4F7F\u3046
+USE_PREPAREDSTATEMENT.NAME=PreparedStatement\u3092\u4F7F\u7528
 SET_PREPAREDSTATEMENT_PARAMETERS.NAME=PreparedStatement\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u306E\u8A2D\u5B9A
 SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_INDEX=\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u306E\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9
 SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE=\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u30BF\u30A4\u30D7

main/plugins/org.talend.designer.components.localprovider/components/tDotNETInstantiate/tDotNETInstantiate_messages_fr.properties

@@ -9,4 +9,4 @@ LIBRARY.NAME=DLL \u00E0 charger.
 VALUES.NAME=Param\u00E8tres du constructeur (laisser vide si constructeur par d\u00E9faut)
 PARAMETERS.ITEM.PARAMETER=Valeur (utiliser <ligne>.<colonne> pour passer \u00E0 un flux entrant)
 PARAMETERS.NAME=Valeur(s) \u00E0 passer au constructeur.
-CLASS_NAME.NAME=Nom compl\u00E8tement qualifi\u00E9 de la classe (par exemple ClassLibrary1.Namespace2.Class1)
+CLASS_NAME.NAME=Nom enti\u00E8rement qualifi\u00E9 de la classe (par exemple ClassLibrary1.Namespace2.Class1)

main/plugins/org.talend.designer.components.localprovider/components/tDotNETRow/tDotNETRow_messages_fr.properties

@@ -7,7 +7,7 @@ LIBRARY.NAME=DLL \u00E0 charger.
 VALUES.NAME=Param\u00E8tres du constructeur (laisser vide si constructeur par d\u00E9faut)
 PARAMETERS.ITEM.PARAMETER=Valeur (utiliser <ligne>.<colonne> pour passer \u00E0 un flux entrant)
 PARAMETERS.NAME=Valeur(s) \u00E0 passer au constructeur.
-CLASS_NAME.NAME=Nom compl\u00E8tement qualifi\u00E9 de la classe (par exemple ClassLibrary1.Namespace2.Class1)
+CLASS_NAME.NAME=Nom enti\u00E8rement qualifi\u00E9 de la classe (par exemple ClassLibrary1.Namespace2.Class1)
 USE_STATIC_METHOD.NAME=Utiliser une m\u00E9thode statique
 USE_EXISTING_INSTANCE.NAME=Utiliser une instance existante
 IS_VOID_METHOD.NAME=La m\u00E9thode ne retourne pas de valeur

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

@@ -181,6 +181,10 @@
    </PARAMETERS>
     
   <ADVANCED_PARAMETERS>
+		<PARAMETER NAME="DRY_RUN" FIELD="CHECK" NUM_ROW="1">
+			<DEFAULT>false</DEFAULT>
+		</PARAMETER>
+
 		<PARAMETER NAME="PROPERTIES" FIELD="TEXT" NUM_ROW="10" REPOSITORY_VALUE="PROPERTIES_STRING" SHOW_IF="(#LINK@CONNECTOR.OUT.TABLE_REF == '0') AND (USE_EXISTING_CONNECTION == 'false')">
 			<DEFAULT>""</DEFAULT>
 		</PARAMETER>
@@ -194,11 +198,12 @@
    		<IMPORTS>
 			<IMPORT NAME="Driver-jTDS" MODULE="jtds-1.3.1-patch-20190523.jar" MVN="mvn:net.sourceforge.jtds/jtds/1.3.1-patch-20190523"   REQUIRED_IF="(DRIVER == 'JTDS') AND (USE_EXISTING_CONNECTION == 'false')" />
 			<IMPORT NAME="Driver-mssql-jdbc" MODULE="mssql-jdbc.jar" MVN="mvn:org.talend.libraries/mssql-jdbc/6.0.0"  REQUIRED_IF="(DRIVER == 'MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
-            <IMPORT NAME="adal4j" MODULE="adal4j-1.6.5.jar" MVN="mvn:com.microsoft.azure/adal4j/1.6.5"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
+            <IMPORT NAME="adal4j" MODULE="adal4j-1.6.7.jar" MVN="mvn:com.microsoft.azure/adal4j/1.6.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
             <IMPORT NAME="commons-lang3" MODULE="commons-lang3-3.10.jar" MVN="mvn:org.apache.commons/commons-lang3/3.10"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
             <IMPORT NAME="commons-codec" MODULE="commons-codec-1.14.jar" MVN="mvn:commons-codec/commons-codec/1.14"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
             <IMPORT NAME="gson" MODULE="gson-2.8.6.jar" MVN="mvn:com.google.code.gson/gson/2.8.6"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
-            <IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-6.5.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/6.5"  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="content-type" MODULE="content-type-2.1.jar" MVN="mvn:com.nimbusds/content-type/2.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')" />
             <IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-8.11.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/8.11"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
             <IMPORT NAME="javax.mail" MODULE="javax.mail-1.6.2.jar" MVN="mvn:com.sun.mail/javax.mail/1.6.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />