Merge remote-tracking branch 'origin/maintenance/5.6'

This commit is contained in:
amarkevich
2014-12-19 12:01:24 +03:00
7 changed files with 14 additions and 14 deletions

View File

@@ -100,7 +100,7 @@
REQUIRED="true" />
<IMPORT NAME="jsr305-"
MODULE="jsr305-1.3.9.jar"
REQUIRED="true" />
REQUIRED="true" BundleID="" />
<IMPORT NAME="jackson-core"
MODULE="jackson-core-2.2.2.jar"
@@ -117,7 +117,7 @@
<IMPORT NAME="commons-logging"
MODULE="commons-logging-1.1.3.jar"
UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-logging-1.1.3.jar"
REQUIRED="true" />
REQUIRED="true" BundleID="" />
<IMPORT NAME="commons-codec"
MODULE="commons-codec-1.4.jar"
UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-codec-1.4.jar"

View File

@@ -151,7 +151,7 @@
REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
<IMPORT NAME="jsr305-"
MODULE="jsr305-1.3.9.jar"
REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" BundleID="" />
<IMPORT NAME="jackson-core"
MODULE="jackson-core-2.2.2.jar"
@@ -168,7 +168,7 @@
<IMPORT NAME="commons-logging"
MODULE="commons-logging-1.1.3.jar"
UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-logging-1.1.3.jar"
REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" BundleID="" />
<IMPORT NAME="commons-codec"
MODULE="commons-codec-1.4.jar"
UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-codec-1.4.jar"

View File

@@ -128,7 +128,7 @@
REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
<IMPORT NAME="jsr305-"
MODULE="jsr305-1.3.9.jar"
REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" BundleID="" />
<IMPORT NAME="jackson-core"
MODULE="jackson-core-2.2.2.jar"
@@ -145,7 +145,7 @@
<IMPORT NAME="commons-logging"
MODULE="commons-logging-1.1.3.jar"
UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-logging-1.1.3.jar"
REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" BundleID="" />
<IMPORT NAME="commons-codec"
MODULE="commons-codec-1.4.jar"
UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-codec-1.4.jar"

View File

@@ -116,7 +116,7 @@
REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
<IMPORT NAME="jsr305-"
MODULE="jsr305-1.3.9.jar"
REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" BundleID="" />
<IMPORT NAME="jackson-core"
MODULE="jackson-core-2.2.2.jar"
@@ -133,7 +133,7 @@
<IMPORT NAME="commons-logging"
MODULE="commons-logging-1.1.3.jar"
UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-logging-1.1.3.jar"
REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" BundleID="" />
<IMPORT NAME="commons-codec"
MODULE="commons-codec-1.4.jar"
UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-codec-1.4.jar"

View File

@@ -127,7 +127,7 @@
REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
<IMPORT NAME="jsr305-"
MODULE="jsr305-1.3.9.jar"
REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" BundleID="" />
<IMPORT NAME="jackson-core"
MODULE="jackson-core-2.2.2.jar"
@@ -144,7 +144,7 @@
<IMPORT NAME="commons-logging"
MODULE="commons-logging-1.1.3.jar"
UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-logging-1.1.3.jar"
REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" BundleID="" />
<IMPORT NAME="commons-codec"
MODULE="commons-codec-1.4.jar"
UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-codec-1.4.jar"

View File

@@ -123,7 +123,7 @@
REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
<IMPORT NAME="jsr305-"
MODULE="jsr305-1.3.9.jar"
REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" BundleID="" />
<IMPORT NAME="jackson-core"
MODULE="jackson-core-2.2.2.jar"
@@ -140,7 +140,7 @@
<IMPORT NAME="commons-logging"
MODULE="commons-logging-1.1.3.jar"
UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-logging-1.1.3.jar"
REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" BundleID="" />
<IMPORT NAME="commons-codec"
MODULE="commons-codec-1.4.jar"
UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-codec-1.4.jar"

View File

@@ -141,7 +141,7 @@
REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
<IMPORT NAME="jsr305-"
MODULE="jsr305-1.3.9.jar"
REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" BundleID="" />
<IMPORT NAME="jackson-core"
MODULE="jackson-core-2.2.2.jar"
@@ -158,7 +158,7 @@
<IMPORT NAME="commons-logging"
MODULE="commons-logging-1.1.3.jar"
UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-logging-1.1.3.jar"
REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" BundleID="" />
<IMPORT NAME="commons-codec"
MODULE="commons-codec-1.4.jar"
UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-codec-1.4.jar"