Compare commits

..

167 Commits

Author SHA1 Message Date
Xilai Dai
83a3cbb69d fix(APPINT-34526) backport the fixes from APPINT-31563 (#5229) 2022-04-18 16:51:27 +08:00
kjwang
42329dcb8a Revert "Jding/tup 24162 studio version is not correct after applied serveral patches (#2654) (#2663) (#4832)" (#4903)
This reverts commit 3bbf2d0923.
2021-12-23 14:37:50 +08:00
kjwang
3bbf2d0923 Jding/tup 24162 studio version is not correct after applied serveral patches (#2654) (#2663) (#4832)
* fix(TUP-24162)Studio version is not correct after applied serveral
patches on 7.2.1
https://jira.talendforge.org/browse/TUP-24162
2021-12-09 17:06:30 +08:00
pyzhou
2fa2eb4b95 chore:fix MarkLogic build fail okhttp-digest 2021-12-03 00:09:52 +08:00
kjwang
9136b543d2 Fix: TUP-28372 Modules Tab is not updated when switching branches. (#4776)
Fix: TUP-28372 Modules Tab is not updated when switching branches.
https://jira.talendforge.org/browse/TUP-28372
2021-11-08 14:06:07 +08:00
Chao MENG
f5d8ac6ba1 Cmeng/backport/patch/7.2.1 performance improvements (#4705)
* fix(TUP-27814): Skip file.exists() (#3459)

Conflicts:
	main/plugins/org.talend.updates.runtime/src/main/java/org/talend/updates/runtime/utils/UpdateTools.java

* fix(TUP-29595): Slow start of studio when install all additional (#3962)

fix(TUP-29595): Slow start of studio when install all additional packages
https://jira.talendforge.org/browse/TUP-29595
2021-11-08 11:02:01 +08:00
oleksandr
98c41d1398 TAC-15694 (#4754)
[7.2.1] TAC jobs cant be killed, and incorrect status reported

Co-authored-by: oleksandr <ovelychko@talend.com>
2021-11-03 18:43:58 +08:00
bhe-talendbj
068d7acfa1 bugfix(TUP-28659): backport (#4470)
* fix(TUP-28659): backport

* fix(TUP-28659): backport

* fix(TUP-28659): update version
2021-08-02 09:48:07 +08:00
vdrokov
90b8436fed APPINT-32815: revert bug in springboot build (microservice) 2021-06-01 15:51:52 +02:00
vdrokov
50ae23829b APPINT-33123: Account TDI use case (#4328) 2021-05-31 17:26:38 +03:00
vdrokov
2102dda9f2 APPINT-33113: Fix not available routines (#4323) 2021-05-31 10:31:36 +03:00
vdrokov
5c3e2d8e2a APPINT-32815: Bug in springboot build (microservice) (#4241) 2021-05-28 10:56:40 +03:00
apoltavtsev
f5f70a9a03 TESB-32452 handling NPE during job jar name calculation 2021-04-08 12:28:39 +02:00
vdrokov
3e9b826d7b TESB-32452 (#4134)
After applying the latest patch, trunjob component fails with "java.io.IOException: Cannot run program "java.exe": error=2, No such file or directory"
2021-03-31 17:27:53 +02:00
bhe-talendbj
baaa12b968 fix(TUP-30360): add an option to disable sharing libraries (#4040) (#4058)
* fix(TUP-30360): add an option to disable sharing libraries (#4040)

* fix(TUP-30360): add an option to disable sharing libraries

* fix(TUP-30360): add new preference to disable sharing libs at startup

* fix(TUP-30360): update log message

* fix(TUP-30360): install libfile

Conflicts:
	main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/network/NetworkUtil.java
	main/plugins/org.talend.librariesmanager/src/main/java/org/talend/librariesmanager/model/service/LocalLibraryManager.java

* fix(TUP-30360): fix sharing user components

* fix(TUP-30360): fix sharing jars

* fix(TUP-30360): fix sharing components
2021-03-01 17:05:04 +08:00
Chao MENG
864763a9c7 item(TUP-30180): Studio slowness on merge operation (#4068)
* fix(TUP-29390): Improve the file commit logic in RepositoryWorkUnit (#3901)

fix(TUP-29390): Improve the file commit logic in RepositoryWorkUnit during Pull and Merge
https://jira.talendforge.org/browse/TUP-29390

* fix(TUP-30103): [7.1.1] Studio somtimes hangs for 20 seconds
https://jira.talendforge.org/browse/TUP-30103

* fix(TUP-30103): [7.1.1] Studio somtimes hangs for 20 seconds
https://jira.talendforge.org/browse/TUP-30103

Conflicts:
	main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/tools/AggregatorPomsHelper.java
2021-02-26 11:37:49 +08:00
apoltavtsev
58312f6c41 feat(TESB-31727) Backport Publishing a route with cTalendJob from Studio and commandline gives different results 2021-01-29 09:51:14 +01:00
apoltavtsev
22b0854f0f fix(TESB-31274) jobs containing tRestClient build issues 2021-01-20 14:07:00 +01:00
chmyga
c72882d4f3 Dchmyga/tdi 44962 backport to master (#3704)
* Revert "fix(TDI-44826): Missing line in Resume log (#3640)" (#3691)

This reverts commit cf52e1e004.

Co-authored-by: Dmytro Chmyga <dmytro.chmyga@synapse.com>

* fix(TDI-44962): fix stream closed exception (#3692)

* Recreate FileWriter with append after writing header

* Add csv writer to shared writer map

Co-authored-by: Dmytro Chmyga <dmytro.chmyga@synapse.com>

Co-authored-by: Dmytro Chmyga <dmytro.chmyga@synapse.com>
# Conflicts:
#	main/plugins/org.talend.librariesmanager/resources/java/routines/system/ResumeUtil.java
2020-12-07 22:04:17 +08:00
jiezhang-tlnd
b1581aac33 fix(TUP-28893)Support more types of artifact for share libs (#3831)
* fix(TUP-28893)Support more types of artifact for share libs
https://jira.talendforge.org/browse/TUP-28893

Conflicts:
	main/plugins/org.talend.librariesmanager/src/main/java/org/talend/librariesmanager/nexus/ArtifacoryRepositoryHandler.java
	main/plugins/org.talend.librariesmanager/src/main/java/org/talend/librariesmanager/nexus/nexus3/handler/AbsNexus3SearchHandler.java

* fix(TUP-28893)Support more types of artifact for share libs

* fix junits

* fix junits
2020-11-30 16:51:25 +08:00
bhe-talendbj
510795eb64 fix(TUP-29227): Set prompt value if it is null (#3817) 2020-11-19 15:47:06 +08:00
apoltavtsev
51697c3477 fix(TESB-30661) Wrong artifact version of the job called by a route 2020-10-29 12:06:05 +01:00
bhe-talendbj
df51e4643f bugfix(TUP-26138) Regenerate relationship.index (#3088) (#3473) (#3739)
* fix(TUP-26138): Regenerate relationship index

Conflicts:
	main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/model/ProxyRepositoryFactory.java
2020-10-22 14:54:50 +08:00
kjwang
6672a29377 Fix TUP-28603 'Export item' missing signature (#3643) (#3681) (#3740)
Fix TUP-28603 'Export item' missing signature
https://jira.talendforge.org/browse/TUP-28603
2020-10-22 10:19:11 +08:00
Chao MENG
fc613a6a31 fix(TUP-27076): Unable to connect to codecommit GIT after the first (#3698)
login.
https://jira.talendforge.org/browse/TUP-27076
2020-10-12 09:34:36 +08:00
undx
438d6a43ab fix(build-job): add missing component-runtime pom 2020-10-08 16:24:37 +02:00
undx
2117a06cf2 fix(TUP-25152): backport to patch/7.2.1 2020-10-08 13:38:58 +02:00
Emmanuel GALLOIS
e82174e99b fix(TPS-4351): Make component-runtime class loader find classes in JobServer (#3668) 2020-10-06 13:56:29 +02:00
bhe-talendbj
101e58e159 fix(TUP-27268): Add isRequiredAlways for ILoginTask (#3593) (#3603) (#3604)
Conflicts:
	main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/model/ProxyRepositoryFactory.java

Conflicts:
	main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/model/ProxyRepositoryFactory.java
2020-09-07 16:01:30 +08:00
Chao MENG
a5d49f0051 Cmeng/patch/7.2/tup 28316 all git related issues (#3569)
* Revert "Revert "fix(TUP-27989): Git related issues checked with support (#3494)""

This reverts commit cdf41fb420.

* Revert "Revert "fix(TUP-28316): Left git related issues checked with support https://jira.talendforge.org/browse/TUP-28316""

This reverts commit cdfb44ced5.

* fix(TUP-28316): Left git related issues checked with support
https://jira.talendforge.org/browse/TUP-28316
2020-08-26 12:05:21 +08:00
Chao MENG
cdf41fb420 Revert "fix(TUP-27989): Git related issues checked with support (#3494)"
This reverts commit fdb1739b1b.
2020-08-19 21:35:53 +08:00
Chao MENG
cdfb44ced5 Revert "fix(TUP-28316): Left git related issues checked with support https://jira.talendforge.org/browse/TUP-28316"
This reverts commit 241f022cd4.
2020-08-19 21:35:46 +08:00
Chao MENG
241f022cd4 fix(TUP-28316): Left git related issues checked with support
https://jira.talendforge.org/browse/TUP-28316

Conflicts:
	main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/recyclebin/RecycleBinManager.java
2020-08-19 19:38:48 +08:00
Chao MENG
fdb1739b1b fix(TUP-27989): Git related issues checked with support (#3494)
https://jira.talendforge.org/browse/TUP-27989
2020-08-19 19:38:48 +08:00
Chao MENG
c0b4202259 fix(TUP-27953): tSalesforceInput component displays in-job (#3504) (#3560)
tSalesforceConnection incorrectly
https://jira.talendforge.org/browse/TUP-27953
2020-08-19 10:46:57 +08:00
jiezhang-tlnd
bd3cc178de Jzhang/72/feat/tup 27862 re (#3543)
* feat(TUP-27862)Add possibility to customize pattern for dates when

* feat(TUP-27862)Add possibility to customize pattern for dates when
retrieve table

* feat(TUP-27862)Add possibility to customize pattern for dates when
retrieve table
2020-08-11 12:00:02 +08:00
jiezhang-tlnd
984ca27e4e Jzhang/feat/73/tup 27862 (#3480) (#3522)
* feat(TUP-27862)Add possibility to customize pattern for dates when
retrieve table

* feat(TUP-27862)Add possibility to customize pattern for dates when
retrieve table

* feat(TUP-27862)Add possibility to customize pattern for dates when
retrieve table

* feat(TUP-27862)Add possibility to customize pattern for dates when
retrieve table

* feat(TUP-27862)Add possibility to customize pattern for dates when
retrieve table

* add junit

* add junits

* add junits
2020-08-07 10:52:09 +08:00
Zhiwei Xue
0468f1613c fix(TUP-26876):NoClassDefFoundError when I run spark job with JobServer (#3517) 2020-08-03 16:01:58 +08:00
apoltavtsev
169610aa09 TESB-29071 Bean in route gives wrong output on running in studio 2020-07-31 12:10:01 +02:00
bhe-talendbj
99ebc8c31b fix(TUP-26687): backport (#3508) 2020-07-31 10:27:36 +08:00
hzhao-talendbj
947f5b1730 fix(TUP-26810)if one jar used by two different components, it will (#… (#3465)
* fix(TUP-26810)if one jar used by two different components, it will (#3228)

fix(TUP-26810)if one jar used by two different components, it will upload to nexus with two versions

* TPS-4193  modify code mistake

* test github not pushed

* tps-4193
2020-07-14 09:28:04 +08:00
vdrokov
ca5257f41f fix(TESB-29435): cConfig "Install" button needs to be pressed twice to import a jar (#3467) 2020-07-13 11:26:55 +03:00
Chao MENG
50bc40a36d Revert "Revert "fix(TUP-24942): need to do studio metadata mapping to tsapbapi (#2847)""
This reverts commit 93fd820240.
2020-07-13 10:13:58 +08:00
Chao MENG
163a5fed4b Revert "Revert "fix(TUP-24942): need to do studio metadata mapping to tsapbapi (#2843)""
This reverts commit 254ed5f9c2.
2020-07-13 10:13:44 +08:00
Jane Ding
94ec866da2 fix(TUP-27590)Relationship.index might get really big (#3463)
https://jira.talendforge.org/browse/TUP-27590
2020-07-10 09:24:44 +08:00
Jane Ding
9e5ebe9bd6 fix(TUP-27590):Relationship.index might get really big (#3461)
https://jira.talendforge.org/browse/TUP-27590
2020-07-09 17:09:08 +08:00
Chao MENG
254ed5f9c2 Revert "fix(TUP-24942): need to do studio metadata mapping to tsapbapi (#2843)"
This reverts commit 1e067fe87d.
2020-07-08 15:54:04 +08:00
Chao MENG
93fd820240 Revert "fix(TUP-24942): need to do studio metadata mapping to tsapbapi (#2847)"
This reverts commit 120edfe17c.
2020-07-08 15:53:43 +08:00
Chao MENG
120edfe17c fix(TUP-24942): need to do studio metadata mapping to tsapbapi (#2847)
fix(TUP-24942): need to do studio metadata mapping to tsapbapi components for the new closedlist when D&D metadata to job
https://jira.talendforge.org/browse/TUP-24942
2020-07-08 09:37:03 +08:00
Chao MENG
1e067fe87d fix(TUP-24942): need to do studio metadata mapping to tsapbapi (#2843)
fix(TUP-24942): need to do studio metadata mapping to tsapbapi components for the new closedlist when D&D metadata to job
https://jira.talendforge.org/browse/TUP-24942
2020-07-08 09:32:57 +08:00
Jane Ding
17647bf874 fix(TUP-27590):Relationship.index might get really big (#3431)
* fix(TUP-27590):Relationship.index might get really big
https://jira.talendforge.org/browse/TUP-27590

* fix(TUP-27590):Relationship.index might get really big
https://jira.talendforge.org/browse/TUP-27590

* fix(TUP-27590)Relationship.index might get really big
https://jira.talendforge.org/browse/TUP-27590
relatedItems is empty should not add  as a record
2020-07-07 10:23:50 +08:00
bhe-talendbj
e6bb7ef649 fix(TUP-26539): Unassociate data from associateListeners (#3169) (#3177) (#3433)
* fix(TUP-26539): Fix wrong tree node implmentation

* fix(TUP-26539): add test case

* fix(TUP-26539): Remove reference to itself

* fix(TUP-26539): Return root node

* fix(TUP-26539): Update test case

* fix(TUP-26539): update test case

* fix(TUP-26539): Unassociate unnecessary listeners

* fix(TUP-26539): Revert changes of RepositoryNode

* fix(TUP-26539): Add override annotation
2020-07-07 10:21:44 +08:00
sbliu
5523cffed8 TUP-27416 Validate network, timeout value read from nexus timeout preference configuration . 2020-07-07 10:02:22 +08:00
hzhao-talendbj
132c4915da fix miss dependency in assmble.xml with loop dependency (#3422) 2020-07-02 14:28:56 +08:00
bhe-talendbj
cb4139acf3 bugfix(TUP-27078): Fix parse response data get from artifactory which is runing with https (#3343) (#3434) 2020-07-02 14:06:52 +08:00
bhe-talendbj
a68447afe4 fix(TUP-27053): backport (#3361) (#3389) 2020-06-19 15:13:07 +08:00
jiezhang-tlnd
c28b686049 Jzhang/721/temp/tps 4050 (#3393)
* Jzhang/7.2/bugfix/tup 26896 (#3353)

* fix(TUP-26896)Error create a Sybase connection in metadata and cannot
retrieve tables
https://jira.talendforge.org/browse/TUP-26896

* format code

* update mapping sybase
2020-06-12 16:37:41 +08:00
Zhiwei Xue
ab7c0c0833 chore: Remove junit of Mojo version. 2020-05-21 14:20:12 +08:00
vdrokov
4a1e06e010 fix(TESB-29148): Add lines deleted by accident. (#3312) 2020-05-20 21:15:21 +02:00
Chao MENG
8ff0e806cf fix(TUP-27077): NoClassDefFoundException when using "independent process to run subjob" and tAzureAdlsGen2Input 2020-05-19 09:55:35 +08:00
Jane Ding
3149ac1e6b fix(TUP-27003):Should disable the Commit button of Uncommitted files (#3273) (#3307)
found dialog when project is in MERGING state
https://jira.talendforge.org/browse/TUP-27003
2020-05-18 18:49:44 +08:00
Chao MENG
8f513789aa feat(TUP-26569): merge known conflicts automatically
https://jira.talendforge.org/browse/TUP-26569
2020-05-18 17:53:43 +08:00
Mike Yan
b245900000 fix(TCOMP-1681): Adding missing poms for OSGi type build 2020-05-15 17:25:03 +08:00
bhe-talendbj
ad2a22dcc4 fix(TUP-26809): backport 2020-05-14 16:04:36 +08:00
bhe-talendbj
e3f1c84dfd fix(TUP-26728): backport
Conflicts:
	main/plugins/org.talend.core.runtime/src/main/java/org/talend/designer/runprocess/IRunProcessService.java
2020-05-14 11:27:21 +08:00
jiezhang-tlnd
3b04a2f690 fix(TUP-26896)Error create a Sybase connection in metadata and cannot
(#3257)

retrieve tables (#3231)

* fix(TUP-26896)Error create a Sybase connection in metadata and cannot
retrieve tables
https://jira.talendforge.org/browse/TUP-26896

* fix(TUP-26896)retrieve schema on sybase 16 anywhere metadate get empry
value
https://jira.talendforge.org/browse/TUP-26896

* fix(TUP-26896)Error create a Sybase connection in metadata and cannot
retrieve tables

* fix(TUP-26896)Error create a Sybase connection in metadata and cannot
retrieve tables
https://jira.talendforge.org/browse/TUP-26896

* fix(TUP-26896)Error create a Sybase connection in metadata and cannot
retrieve tables

* fix(TUP-26896)Error create a Sybase connection in metadata and cannot
retrieve tables

* fix(TUP-26896)Error create a Sybase connection in metadata and cannot
retrieve tables

* fix(TUP-26896)Error create a Sybase connection in metadata and cannot
retrieve tables

* fix(TUP-26896)Error create a Sybase connection in metadata and cannot
retrieve tables

* fix(TUP-26896)Error create a Sybase connection in metadata and cannot
retrieve tables

* fix(TUP-26896)Error create a Sybase connection in metadata and cannot
retrieve tables
https://jira.talendforge.org/browse/TUP-26896

Conflicts:
	main/plugins/org.talend.metadata.managment/src/main/java/org/talend/metadata/managment/model/DBConnectionFillerImpl.java

Conflicts:
	main/plugins/org.talend.metadata.managment/src/main/java/org/talend/metadata/managment/model/DBConnectionFillerImpl.java

Conflicts:
	main/plugins/org.talend.metadata.managment/src/main/java/org/talend/metadata/managment/model/DBConnectionFillerImpl.java
	main/plugins/org.talend.metadata.managment/src/main/java/org/talend/metadata/managment/utils/MetadataConnectionUtils.java
2020-05-14 10:51:25 +08:00
undx
0c82d7a96b feat(TCOMP-1681): Make ESB Studio job export TaCoKit compliant 2020-05-12 18:29:11 +02:00
sbliu
17110bb1fa TPS-3943 [7.2.1]Talend MDM Connection Errors(TMDM-14505, TMDM-14565)(#3270)
* TMDM-14505 MDM connection in metadata randomly failed with error 'Failed to connect to MDM, please change MDM settings' 

Moved interface IWebServiceHook from mdm bundle and renamed to IMDMWebServiceHook,re-use the implemented webservice hook in mdm for both mdm & di side to establish mdm connection token.
Add unit test to check presence of the required header that containing token.

* TMDM-14565 Check mdm connection cannot work both in mdm and di perspective at same time (#3187)

Switch context class loader for web service created.
2020-05-09 17:55:52 +08:00
hzhao-talendbj
29b1f3a97c fix(TUP-26388)Amazon Redshift Driver class not working with Implicit (#3181)
* fix(TUP-26388)Amazon Redshift Driver class not working with Implicit
Context

* fix(TUP-26388)Amazon Redshift Driver class not working with Implicit
Context
2020-05-07 19:29:04 +08:00
hzhao-talendbj
6af4cbf201 Revert "fix(26752): Merge branch 'bhe/bugfix/TUP-26752_721' into hzhao/TPS-3852-temp"
This reverts commit 41ef59868e.
2020-05-07 19:22:28 +08:00
bhe-talendbj
a3c1d73f36 fix(TUP-26752): backport 2020-05-07 19:10:32 +08:00
bhe-talendbj
41ef59868e fix(26752): Merge branch 'bhe/bugfix/TUP-26752_721' into hzhao/TPS-3852-temp 2020-05-07 18:04:58 +08:00
Jane Ding
ac7c8ff40d fix(TUP-23452)COMPUTE_DEPENDENCIES_FAILED:{path=META-INF/maven/org.ta… (#3250)
* fix(TUP-23452)COMPUTE_DEPENDENCIES_FAILED:{path=META-INF/maven/org.talend.components/components-salesforce-runtime/dependencies.txt
(#2555) (#2561)

https://jira.talendforge.org/browse/TUP-23452

Conflicts:
	main/plugins/org.talend.updates.runtime/src/main/java/org/talend/updates/runtime/nexus/component/ComponentsDeploymentManager.java

* fix(TUP-23452)COMPUTE_DEPENDENCIES_FAILED:{path=META-INF/maven/org.talend.components/components-salesforce-runtime/dependencies.txt
https://jira.talendforge.org/browse/TUP-23452
2020-05-07 17:53:42 +08:00
hwang-talend
7872cf40d8 bugfix(TUP-26059):tELTPostgresqlMap lost its "DB Type" column for which (#3075)
bugfix(TUP-26059):tELTPostgresqlMap lost its "DB Type" column for which the value should be "BPCHAR"
2020-05-07 17:46:32 +08:00
hzhao-talendbj
62997993ee fix missing db value (#3209) (#3211) 2020-05-07 17:27:19 +08:00
hwang-talend
b81bba4311 bugfix(TUP-26758):[7.2.1] Wrong column order when using Schema from (#3198)
* bugfix(TUP-26758):[7.2.1] Wrong column order when using Schema from
Repository

* bugfix(TUP-26758):[7.2.1] Wrong column order when using Schema from
Repository
2020-05-07 17:18:34 +08:00
hwang
6d787c8bb7 Revert "bugfix(TUP-26758):[7.2.1] Wrong column order when using Schema from (#3198)"
This reverts commit 71d4e06163.
2020-04-29 18:28:11 +08:00
hwang
d3edced303 Revert "bugfix(TUP-26059):tELTPostgresqlMap lost its "DB Type" column for which (#3075)"
This reverts commit 0dc85faca3.
2020-04-29 18:27:27 +08:00
hwang-talend
71d4e06163 bugfix(TUP-26758):[7.2.1] Wrong column order when using Schema from (#3198)
* bugfix(TUP-26758):[7.2.1] Wrong column order when using Schema from
Repository

* bugfix(TUP-26758):[7.2.1] Wrong column order when using Schema from
Repository
2020-04-29 18:15:05 +08:00
hwang-talend
0dc85faca3 bugfix(TUP-26059):tELTPostgresqlMap lost its "DB Type" column for which (#3075)
bugfix(TUP-26059):tELTPostgresqlMap lost its "DB Type" column for which the value should be "BPCHAR"
2020-04-29 18:02:11 +08:00
vdrokov
672ac95f1c fix(TESB-28815): Fix bundle name (should include -bundle suffix at the end) (#3218) 2020-04-16 12:54:34 +03:00
jiezhang-tlnd
03fd95bb57 Temp patch tps 3844 (#3206)
* fix(TUP-24310):routines is duplicated in the reactor (#2706)

* fix(TUP-24310):routines is duplicated in the reactor (#2741)

* fix(TUP-24310):routines is duplicated in the reactor

* fix(TUP-24310):routines is duplicated in the reactor.

* TUP-26308 Nexus 2 gets populated by different crypto-utils jar versions
(#3116)

https://jira.talendforge.org/browse/TUP-26308

Conflicts:
	main/plugins/org.talend.librariesmanager/src/main/java/org/talend/librariesmanager/nexus/Nexus2RepositoryHandler.java

* fix(TUP-26229):Dynamic Schema default Mapping can't be changed (#3184)

* Fix TUP-26346 Files from custom component folders are uploaded to
nexus
multiple times
https://jira.talendforge.org/browse/TUP-26346

* Fix TUP-26346 Files from custom component folders are uploaded to
nexus
multiple times
https://jira.talendforge.org/browse/TUP-26346

* bugfix(TUP-26475):Job is referring to the joblet present in the (#3146)

bugfix(TUP-26475):Job is referring to the joblet present in the reference job even after we delete it from the main job

Co-authored-by: Zhiwei Xue <zwxue@talend.com>
Co-authored-by: kjwang <kjwang@talend.com>
Co-authored-by: hcyi <hcyi@talend.com>
Co-authored-by: hwang-talend <hwang@talend.com>
2020-04-13 16:08:56 +08:00
hcyi
38b1a6bbaa TPS-3909:[7.3.1] DI job with Big Data components fail when using the custom hadoop conf file location feature(TUP-26580) (#3171)
* fix(TUP-26155):improve for dataviewer if MongoDB with SSL (#3111) (#3132)

* fix(TUP-26155):fix compilation error (#3140)
2020-03-30 17:15:46 +08:00
hzhao-talendbj
3efe68118a fix mac os display issue 2020-03-24 21:53:15 +08:00
hzhao-talendbj
f3c9e7439e fix column names are same issue (#3155) (#3156) 2020-03-24 16:51:04 +08:00
hzhao-talendbj
242760143f fix(TUP-26081): Share libraries pb (#3063) (#3138)
* fix(TUP-26081): Share libraries pb

https://jira.talendforge.org/browse/TUP-26081

* fix(TUP-26081): Share libraries pb

https://jira.talendforge.org/browse/TUP-26081

Co-authored-by: Chao MENG <cmeng@talend.com>
2020-03-23 15:16:58 +08:00
Zhiwei Xue
f98bd78d07 fix(TUP-25929):Studio re synchronizing jars with artifact repository
every time when logged into studio
2020-03-23 15:10:11 +08:00
kjwang
03b61215d0 fix(TUP-26189): [7.2.1] snowflake metadata connection with proxy failure (#3117)
fix(TUP-26189): [7.2.1] snowflake metadata connection with proxy
failure

https://jira.talendforge.org/browse/TUP-26189
2020-03-23 14:40:43 +08:00
bhe-talendbj
c3910a11a0 bugfix(TUP-25965) Include subjob's test reports (#3055) (#3099)
* bugfix(TUP-25965) Synchronize test reports

* bugfix(TUP-25965) Ignore test failures and zip test reports

* bugfix(TUP-25965) Ignore test failures and zip test reports

* bugfix(TUP-25965) Ignore test failures and zip test reports

* bugfix(TUP-25965) Ignore test failures and zip test reports

* bugfix(TUP-25965) Ignore test failures

* bugfix(TUP-25965) Ignore test failures

* bugfix(TUP-25965) Skip tests when running job

* fix(TUP-25965): Call service to check is build job or not

Conflicts:
	main/plugins/org.talend.repository.items.importexport/plugin.xml
2020-03-23 14:37:04 +08:00
hzhao-talendbj
6b73594486 fix(TUP-25889)Display issue for the line between Linker source and (#3103) (#3137)
* fix(TUP-25889)Display issue for the line between Linker source and
target on Mac and Ubuntu

* fix(TUP-25889)Display issue for the line between Linker source and
target on Mac and Ubuntu
2020-03-23 14:29:14 +08:00
Zhiwei Xue
f247cbf4de fix(TUP-26344):Some job including customer component can't generate code (#3121)
migrated from 6.3.1 to 7.2.1
2020-03-12 12:02:35 +08:00
hwang-talend
68372a9d7a bugfix(TUP-25959):Incorrect message is observed in the tWarn component (#3098)
bugfix(TUP-25959):Incorrect message is observed in the tWarn component
2020-03-09 14:57:33 +08:00
jiezhang-tlnd
19e62edbec Temp patch tps 3681 (#3102)
* fix(TUP-26170):fix subjob dependencies missing in classpath problem of (#3091)

CI.

* fix(TUP-23789)Pom files are not generated sometimes for the jobs in (#2610)

* fix(TUP-23789)Pom files are not generated sometimes for the jobs in
7.1.1
https://jira.talendforge.org/browse/TUP-23789

* fix(TUP-23789)Pom files are not generated sometimes for the jobs in
7.1.1
https://jira.talendforge.org/browse/TUP-23789
Add a junit.

Co-authored-by: Zhiwei Xue <zwxue@talend.com>
Co-authored-by: Jane Ding <35018295+jding-tlnd@users.noreply.github.com>
2020-02-24 14:38:36 +08:00
Chao MENG
a8d56d413d Patch/7.2.1 tps 3583 (#2989) 2020-01-09 17:20:12 +01:00
Chao MENG
df0fde5b02 Revert "feat(TUP-25226): Make the hadoop conf jar path a contextualizable parameter in the Hadoop conf wizard (#2914)"
This reverts commit 85901957ce.
2020-01-02 11:19:16 +08:00
Chao MENG
5c0ddf4cd4 Revert "Cmeng/patch/7.2.1/tup 25226 fix (#2955)"
This reverts commit 6d283447e5.
2020-01-02 11:18:11 +08:00
Chao MENG
89b3abd6dd Revert "feat(TUP-25226): Make the hadoop conf jar path a contextualizable parameter in the Hadoop conf wizard"
This reverts commit 3a538f3ae4.
2020-01-02 11:17:38 +08:00
hzhao-talendbj
8131d3bfcf bugfix(TUP-25194)External jar sync issue in studio using tLibraryLoad (#2867) (#2947)
* bugfix(TUP-25194)External jar sync issue in studio using tLibraryLoad
2019-12-30 14:40:37 +08:00
kjwang
4da5125b07 Kjwang/fix tup 24953 nexus 3 gets populated by crypto utils.jar (#2883) (#2908)
* Fix TUP-24953 Nexus 3 gets populated by crypto-utils.jar
https://jira.talendforge.org/browse/TUP-24953

* TUP-24953 Nexus 3 gets populated by crypto-utils.jar
https://jira.talendforge.org/browse/TUP-24953

Conflicts:
	main/plugins/org.talend.librariesmanager/src/main/java/org/talend/librariesmanager/nexus/Nexus3RepositoryHandler.java
2019-12-30 14:36:55 +08:00
Chao MENG
f6e7e7ec40 fix(TUP-24954): Error "XML format is incorrect", when customer try to (#2803) (#2807)
fix(TUP-24954): Error "XML format is incorrect", when customer try to define a 'File XML metadata' using a XSD file
https://jira.talendforge.org/browse/TUP-24954
2019-12-30 14:32:24 +08:00
Chao MENG
b2bff6cce3 fix(TUP-23984): JSON metadata wizard for output mode throws class cast (#2624) (#2625)
exception on Linux and Mac
https://jira.talendforge.org/browse/TUP-23984
2019-12-30 14:26:56 +08:00
Chao MENG
3a538f3ae4 feat(TUP-25226): Make the hadoop conf jar path a contextualizable
parameter in the Hadoop conf wizard

https://jira.talendforge.org/browse/TUP-25226
2019-12-27 17:15:08 +08:00
Chao MENG
6d283447e5 Cmeng/patch/7.2.1/tup 25226 fix (#2955)
* feat(TUP-25226): Make the hadoop conf jar path a contextualizable
parameter in the Hadoop conf wizard

https://jira.talendforge.org/browse/TUP-25226

* feat(TUP-25226): Make the hadoop conf jar path a contextualizable
parameter in the Hadoop conf wizard

https://jira.talendforge.org/browse/TUP-25226
2019-12-26 19:08:24 +08:00
Mike Yan
e231bff121 fix(TESB-27614): Check NPE for 'files' node in route assembly file (#2941) 2019-12-24 17:56:36 +08:00
Chao MENG
85901957ce feat(TUP-25226): Make the hadoop conf jar path a contextualizable parameter in the Hadoop conf wizard (#2914)
* feat(TUP-25226): Make the hadoop conf jar path a contextualizable
parameter in the Hadoop conf wizard

https://jira.talendforge.org/browse/TUP-25226

* fix(TUP-18610):When drag hdfs to spark job,hadoop cluster some context
parameters cann't drag to job
https://jira.talendforge.org/browse/TUP-18610

* fix(TUP-18610)When drag hdfs to job,hadoop cluster some context
parameters cann't drag to job
https://jira.talendforge.org/browse/TUP-18610

* fix(TUP-18610)When drag hdfs to spark job,hadoop cluster some context
parameters cann't drag to job
https://jira.talendforge.org/browse/TUP-18610

* fix(TUP-18610)When drag hdfs to spark job,hadoop cluster some context

parameters cann't drag to job
https://jira.talendforge.org/browse/TUP-18610

Co-authored-by: Jane Ding <35018295+jding-tlnd@users.noreply.github.com>
2019-12-24 11:29:35 +08:00
SunChaoqun
9e13dd710c TESB-27139:"Could not find the context Default" is shown in runtime when (#2936) deploy a route into runtime 2019-12-23 15:24:35 +07:00
Chao MENG
f02e9bd6ae fix(TUP-24749): [7.2.1] issue to download component jar via https proxy (#2876)
https://jira.talendforge.org/browse/TUP-24749
2019-12-02 19:39:27 +08:00
Chao MENG
095f33bea7 Cmeng/backport/7.2/tup 24749 proxy issue (#2871)
* fix(TUP-24749): [7.2.1] issue to download component jar via https
proxy (#2840)

Conflicts:
	main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/nexus/TalendMavenResolver.java
2019-12-02 10:51:58 +08:00
Chao MENG
7b65d316ad Cmeng/bugfix/tup 24749 proxy issue (#2808) (#2813)
* fix(TUP-24749): [7.2.1] issue to download component jar via https
proxy

https://jira.talendforge.org/browse/TUP-24749
https://jira.talendforge.org/browse/TUP-24783
https://jira.talendforge.org/browse/TUP-24606
2019-12-02 10:51:57 +08:00
jiezhang-tlnd
0da7d5235d Jding/test patch tps 3474 (#2861) (#2875)
* Jding/tup 24732 studio code tab doesn't show error (#2805) (#2812)

* fix(TUP-24732)Studio Code tab doesn't generate code/show errors in Job
https://jira.talendforge.org/browse/TUP-24732

* fix(TUP-24732)Studio Code tab doesn't generate code/show errors in Job
https://jira.talendforge.org/browse/TUP-24732

* fix(TUP-24732)Studio Code tab doesn't generate code/show errors in Job
https://jira.talendforge.org/browse/TUP-24732

* Jding/tup 24732 check loop dependency issues (#2844) (#2860)

* fix(TUP-24732)Studio Code tab doesn't generate code/show errors in Job
https://jira.talendforge.org/browse/TUP-24732

* fix(TUP-24732)Studio Code tab doesn't generate code/show errors in Job
https://jira.talendforge.org/browse/TUP-24732

* fix(TUP-24732)Studio Code tab doesn't generate code/show errors in Job
https://jira.talendforge.org/browse/TUP-24732

* fix(TUP-24732)[7.2.1] Studio Code tab doesn't generate code/show errors
in Job
https://jira.talendforge.org/browse/TUP-24732
2019-12-02 10:45:22 +08:00
hwang
66b20dcea5 Revert "bugfix(TUP-24937):Propagate changes in tELTInput schema to tELTMap #2852"
This reverts commit 0b434cfc4a.
2019-11-22 16:07:19 +08:00
hwang
bc6506c9fb Revert "bugfix(TUP-24937):Propagate changes in tELTInput schema to tELTMap"
This reverts commit b55842aa2d.
2019-11-22 16:07:14 +08:00
hwang
0b434cfc4a bugfix(TUP-24937):Propagate changes in tELTInput schema to tELTMap #2852 2019-11-22 11:59:42 +08:00
hwang
b55842aa2d bugfix(TUP-24937):Propagate changes in tELTInput schema to tELTMap 2019-11-21 22:06:25 +08:00
Zhiwei Xue
23e028407e fix(TUP-24365):fix m2 repository problem for zero installation CI (#2764) 2019-11-14 17:38:30 +08:00
hcyi
2b54495b25 fix(TUP-24944):Fail to create teradata connection if connection with (#2837)
additional parameters.
2019-11-14 11:30:57 +08:00
Zhiwei Xue
74f5674c72 fix(TUP-25123):Problem of dependencies with spark joblets (#2823) 2019-11-08 14:13:06 +08:00
Zhiwei Xue
aab1e3f6f8 fix(TUP-24323):_tdm folder is missing after build thmap job (#2693) 2019-11-06 16:00:23 +08:00
nrousseau
390ecb97e5 Update pom.xml 2019-11-06 13:37:14 +08:00
nrousseau
223fb3e2a1 Update pom.xml 2019-11-06 12:27:31 +08:00
nrousseau
9d3a2d2fcd upgrade tacokit 1.1.14 (#2770) 2019-11-04 16:33:49 +08:00
Zhiwei Xue
182e7cd116 fix(TUP-23637):7.x missing local_project for big data spark batch job (#2604) (#2664) 2019-11-01 15:54:45 +08:00
hzhao-talendbj
f4d07e67db fix(TUP-24613)routine section does not allow user to edit required (#2759)
* fix(TUP-24613)routine section does not allow user to edit required
checkbox

* fix(TUP-24613)routine section does not allow user to edit required
checkbox

* fix(TUP-24613)routine section does not allow user to edit required
checkbox

* fix(TUP-24613)routine section does not allow user to edit required
checkbox
2019-11-01 15:43:11 +08:00
SunChaoqun
00ead16a04 TESB-27123:Context does not transmit to Job called by route in the (#2792) second call in runtime 2019-10-28 18:57:08 +08:00
Jane Ding
41876ebe40 fix(TUP-24735)Studio fails to sync jars with Artifactory if password has (#2756) (#2766) (#2790)
* fix(TUP-24735)Studio fails to sync jars with Artifactory if password has
'@' character in it
https://jira.talendforge.org/browse/TUP-24735

* fix(TUP-24735)Studio fails to sync jars with Artifactory if password has
'@' character in it
https://jira.talendforge.org/browse/TUP-24735

* fix(TUP-24735)Studio fails to sync jars with Artifactory if password has
'@' character in it
https://jira.talendforge.org/browse/TUP-24735
2019-10-28 15:13:52 +08:00
kjwang
dda3390d0b kjwang/Fix TUP-24579 MacOS : unable to access remote project after (#2718) (#2728)
applying TPS-3363
https://jira.talendforge.org/browse/TUP-24579
2019-10-25 16:09:50 +08:00
Zhiwei Xue
39392b6ba4 fix(TUP-24623):fix regression. 2019-10-24 12:35:13 +08:00
Zhiwei Xue
2309b47ce8 Revert "fix(TUP-23637):7.x missing local_project for big data spark batch job (#2604) (#2664)"
This reverts commit 09d2997af6.
2019-10-18 18:31:56 +08:00
Zhiwei Xue
09d2997af6 fix(TUP-23637):7.x missing local_project for big data spark batch job (#2604) (#2664) 2019-10-18 18:29:01 +08:00
Zhiwei Xue
530e8793ea fix(TUP-24623):Compilation error on the job with project
references(#2757)
2019-10-18 18:21:11 +08:00
jiezhang-tlnd
8aa27eb00c Update EDatabaseVersion4Drivers.java 2019-10-16 17:46:23 +08:00
Laurent BOURGEOIS
17a5b0c28a Fix(TBD-9289):"Invalid signature file digest for Manifest main attributes" Error with HD Insight Cluster 2019-10-16 11:19:21 +08:00
jiezhang-tlnd
0ef344fd01 fix(TUP-23960)Following TDI-42674, update dependency for Redshift
(#2722)

database metadata
https://jira.talendforge.org/browse/TUP-23960

Conflicts:
	main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/database/conn/version/EDatabaseVersion4Drivers.java
2019-10-14 14:27:40 +08:00
Mike Yan
5a96ad6757 fix(TESB-27087): Add condition for checking ESB service is loaded (#2746) 2019-10-08 11:42:58 +08:00
hcyi
53361f8d22 fix(TUP-24084):Change the display of the new Couchbase component names. (#2720) 2019-09-23 15:26:37 +08:00
Chao MENG
2773b281be fix(TUP-24226): Studio doesn't load latest jar for TCOMPv0 update site patch.
fix(TUP-24226): Studio doesn't load latest jar for TCOMPv0 update site patch. 
https://jira.talendforge.org/browse/TUP-24226
2019-09-23 15:19:06 +08:00
hzhao-talendbj
9f8fea79e4 fix(TUP-23536)Component cannot share to Nexus3.15 from local。 2019-09-23 15:04:25 +08:00
hcyi
3254acbab0 fix(TUP-23264):Studio can't find dependencies for tacokit components. (#2566) (#2577) 2019-09-23 14:50:52 +08:00
hcyi
c4bbe25249 fix(TUP-23106):Tacokit components cannot be copy-pasted in Job Design (#2588) (#2596)
* fix(TUP-23106):Tacokit components cannot be copy-pasted in Job Design

* fix(TUP-23106):Tacokit components cannot be copy-pasted in Job Design
2019-09-23 14:46:14 +08:00
heng zhao
bf7ffb0288 feat(TUP-24028)Add Azure datacenter part of the studio connection 2019-09-09 14:47:45 +08:00
jiezhang-tlnd
72f9b4032c fix(TUP-24232)JDBC metadata connection for Redshift when exported as (#2675)
context, unable to retrieve schema
https://jira.talendforge.org/browse/TUP-24232
2019-09-02 10:41:37 +08:00
yanbasic
4e3bf8631d fix(TESB-26174): Backport to 7.2 patch for tRunJob with tESBConsumer 2019-08-30 16:06:31 +02:00
yanbasic
fec8fd0c06 Revert "fix(TESB-26174): Backport to 7.2 for tRunJob with tESBConsumer"
This reverts commit 0b0e004491.
2019-08-30 16:04:33 +02:00
yanbasic
0b0e004491 fix(TESB-26174): Backport to 7.2 for tRunJob with tESBConsumer 2019-08-30 16:03:45 +02:00
hcyi
235f8b08d1 fix(TUP-23743):ERROR when Job in MDM project calling Job in Reference DI (#2597)
project:import routines.DataQuality cannot be resolved.
2019-08-26 11:49:24 +08:00
SunChaoqun
bbf5b5e859 TESB-24597:Docker Support for Microservice - CI Part (#2634) 2019-08-07 12:17:44 +08:00
SunChaoqun
70dddca938 TESB-24597:Docker Support for Microservice - CI Part 2019-08-07 12:17:36 +08:00
SunChaoqun
958e5d7b1b TESB-24597:Docker Support for Microservice - CI Part 2019-08-07 12:17:28 +08:00
SunChaoqun
ac4d92a777 TESB-24597:Docker Support for Microservice - CI Part 2019-08-07 12:17:20 +08:00
SunChaoqun
e35804e5ca TESB-24597:Docker Support for Microservice - CI Part 2019-08-07 12:17:13 +08:00
SunChaoqun
8d64e1e5cf TESB-24597:Docker Support for Microservice - CI Part 2019-08-07 12:16:52 +08:00
SunChaoqun
6ffe253c1c TESB-24597:Docker Support for Microservice - CI Part 2019-08-07 12:16:44 +08:00
SunChaoqun
e5b7ab490c TESB-24597:Docker Support for Microservice - CI Part 2019-08-07 12:16:27 +08:00
kjwang-talend
07efecb906 TUP-23950 Error in calling spark job from trunjob job inside standard (#2613)
job
https://jira.talendforge.org/browse/TUP-23950
2019-07-24 13:53:59 +08:00
Zhiwei Xue
cee139ef8d fix(TUP-23755):Regression caused by TUP-21532 for ESB test case (#2579) 2019-07-15 10:57:49 +08:00
jiezhang-tlnd
ea00bfcad0 fix(TUP-23520)Change schema order function doesnot work (#2570) 2019-07-15 10:33:35 +08:00
Mike Yan
5744d83e69 fix(TESB-26219): Fixed build.properties for missing libs (#2549) 2019-06-20 12:32:25 +02:00
kjwang-talend
3737400399 kjwang/Fix TUP-23488 Retrieve jar list to download is slow (Fix license (#2539)
name is empty problem)
https://jira.talendforge.org/browse/TUP-23488
2019-06-19 21:52:02 +08:00
Zhiwei Xue
3cbbb38871 fix(TUP-23554):osgi.bundle=empty when install additional package failed (#2545) 2019-06-19 20:46:03 +08:00
Mike Yan
768e4534b5 fix(TESB-26219): Fixed missing libs in apache cxf plugin (#2541) 2019-06-19 14:56:35 +08:00
hwang-talend
07f992c3ee bugfix(TUP-23230):Guess Schema error - SLF4J: Defaulting to no-operation (#2535)
bugfix(TUP-23230):Guess Schema error - SLF4J: Defaulting to no-operation (NOP) logger implementation
2019-06-18 15:35:30 +08:00
Chao MENG
5b72922429 fix(TUP-23519): spark job can't run success when I select EMR58 as (#2534)
distribution
https://jira.talendforge.org/browse/TUP-23519
2019-06-18 15:22:21 +08:00
Chao MENG
c7ebdef42d fix(TUP-23482)should avoid multi version slf4j-log4j jars in the job (#2532)
classpath
https://jira.talendforge.org/browse/TUP-23482
2019-06-18 12:32:39 +08:00
Jane Ding
5fe03dfbf2 fix(TUP-23482)should avoid multi version slf4j-log4j jars in the job (#2529) (#2531)
classpath
https://jira.talendforge.org/browse/TUP-23482
2019-06-18 11:49:34 +08:00
kjwang-talend
496afd04db Kjwang/fix tup 23488 retrieve jar list to download is slow b721 (#2530)
* kjwang/Fix improve the fetch license performance (#2523)

* kjwang/Fix improve the fetch license performance

* kjwang/Fix improve the fetch license performance
https://jira.talendforge.org/browse/TUP-23488

* kjwang/Fix TUP-23488 Retrieve jar list to download is slow (Fix junit (#2528)

error)
https://jira.talendforge.org/browse/TUP-23488
2019-06-18 11:38:22 +08:00
Mike Yan
6b38b13eb9 fix(TESB-26219): Fixed NPE for cloud artifact viewer with Java11 (#2527) 2019-06-17 17:08:02 +08:00
Jenkins Continuous Build server
07df547a88 Set version to 7.2.1 2019-06-14 11:49:03 +02:00
898 changed files with 18839 additions and 13623 deletions

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature id="org.talend.babel.all.tos.feature" label="Babel feature with all languages for TOS" version="7.3.1.qualifier">
<feature id="org.talend.babel.all.tos.feature" label="Babel feature with all languages for TOS" version="7.2.1.qualifier">
<description url="http://www.example.com/description">[Enter Feature Description here.]</description>
<copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>
<license url="http://www.example.com/license">[Enter License Description here.]</license>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.3.1-SNAPSHOT</version>
<version>7.2.1</version>
<relativePath>../../../</relativePath>
</parent>

View File

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl
Bundle-SymbolicName: org.talend.common.ui.runtime.nl
Bundle-Version: 7.3.1.qualifier
Bundle-Version: 7.2.1.qualifier
Fragment-Host: org.talend.common.ui.runtime

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.3.1-SNAPSHOT</version>
<version>7.2.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.common.ui.runtime.nl</artifactId>

View File

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl
Bundle-SymbolicName: org.talend.commons.runtime.nl
Bundle-Version: 7.3.1.qualifier
Bundle-Version: 7.2.1.qualifier
Fragment-Host: org.talend.commons.runtime

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.3.1-SNAPSHOT</version>
<version>7.2.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.commons.runtime.nl</artifactId>

View File

@@ -2,6 +2,6 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Commons UI Nl Fragment
Bundle-SymbolicName: org.talend.commons.ui.nl
Bundle-Version: 7.3.1.qualifier
Bundle-Version: 7.2.1.qualifier
Fragment-Host: org.talend.commons.ui
Bundle-Vendor: .Talend SA.

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.3.1-SNAPSHOT</version>
<version>7.2.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.commons.ui.nl</artifactId>

View File

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: org.talend.core.nl Fragment
Bundle-SymbolicName: org.talend.core.nl
Bundle-Version: 7.3.1.qualifier
Bundle-Version: 7.2.1.qualifier
Bundle-Vendor: .Talend SA.
Fragment-Host: org.talend.core
Bundle-Localization: plugin

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.3.1-SNAPSHOT</version>
<version>7.2.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.core.nl</artifactId>

View File

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl
Bundle-SymbolicName: org.talend.core.repository.nl
Bundle-Version: 7.3.1.qualifier
Bundle-Version: 7.2.1.qualifier
Fragment-Host: org.talend.core.repository

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.3.1-SNAPSHOT</version>
<version>7.2.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.core.repository.nl</artifactId>

View File

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl
Bundle-SymbolicName: org.talend.core.runtime.nl
Bundle-Version: 7.3.1.qualifier
Bundle-Version: 7.2.1.qualifier
Fragment-Host: org.talend.core.runtime

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.3.1-SNAPSHOT</version>
<version>7.2.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.core.runtime.nl</artifactId>

View File

@@ -2,6 +2,6 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl
Bundle-SymbolicName: org.talend.core.ui.nl
Bundle-Version: 7.3.1.qualifier
Bundle-Version: 7.2.1.qualifier
Bundle-Vendor: .Talend SA.
Fragment-Host: org.talend.core.ui

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.3.1-SNAPSHOT</version>
<version>7.2.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.core.ui.nl</artifactId>

View File

@@ -2,6 +2,6 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl Fragment
Bundle-SymbolicName: org.talend.cwm.mip.edit.nl
Bundle-Version: 7.3.1.qualifier
Bundle-Version: 7.2.1.qualifier
Fragment-Host: org.talend.cwm.mip.edit
Bundle-Vendor: .Talend SA.

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.3.1-SNAPSHOT</version>
<version>7.2.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.cwm.mip.edit.nl</artifactId>

View File

@@ -2,6 +2,6 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl Fragment
Bundle-SymbolicName: org.talend.cwm.mip.nl
Bundle-Version: 7.3.1.qualifier
Bundle-Version: 7.2.1.qualifier
Fragment-Host: org.talend.cwm.mip
Bundle-Vendor: .Talend SA.

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.3.1-SNAPSHOT</version>
<version>7.2.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.cwm.mip.nl</artifactId>

View File

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Designer Maven UI NL
Bundle-SymbolicName: org.talend.designer.maven.ui.nl
Bundle-Version: 7.3.1.qualifier
Bundle-Version: 7.2.1.qualifier
Fragment-Host: org.talend.designer.maven.ui
Bundle-Vendor: .Talend SA.
Bundle-Localization: plugin

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.3.1-SNAPSHOT</version>
<version>7.2.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.designer.maven.ui.nl</artifactId>

View File

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: org.talend.help.Nl Fragment
Bundle-SymbolicName: org.talend.help.nl
Bundle-Version: 7.3.1.qualifier
Bundle-Version: 7.2.1.qualifier
Bundle-Vendor: .Talend SA.
Fragment-Host: org.talend.help
Bundle-Localization: plugin

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.3.1-SNAPSHOT</version>
<version>7.2.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.help.nl</artifactId>

View File

@@ -2,6 +2,6 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: org.talend.helpers.nl Fragment
Bundle-SymbolicName: org.talend.helpers.nl
Bundle-Version: 7.3.1.qualifier
Bundle-Version: 7.2.1.qualifier
Fragment-Host: org.talend.helpers
Bundle-Vendor: .Talend SA.

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.3.1-SNAPSHOT</version>
<version>7.2.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.helpers.nl</artifactId>

View File

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: org.talend.librariesmanager Nl Fragment
Bundle-SymbolicName: org.talend.librariesmanager.nl
Bundle-Version: 7.3.1.qualifier
Bundle-Version: 7.2.1.qualifier
Fragment-Host: org.talend.librariesmanager
Bundle-Localization: plugin
Bundle-Vendor: .Talend SA.

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.3.1-SNAPSHOT</version>
<version>7.2.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.librariesmanager.nl</artifactId>

View File

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl
Bundle-SymbolicName: org.talend.librariesmanager.ui.nl
Bundle-Version: 7.3.1.qualifier
Bundle-Version: 7.2.1.qualifier
Fragment-Host: org.talend.librariesmanager.ui

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.3.1-SNAPSHOT</version>
<version>7.2.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.librariesmanager.ui.nl</artifactId>

View File

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl
Bundle-SymbolicName: org.talend.metadata.managment.nl
Bundle-Version: 7.3.1.qualifier
Bundle-Version: 7.2.1.qualifier
Fragment-Host: org.talend.metadata.managment

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.3.1-SNAPSHOT</version>
<version>7.2.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.metadata.managment.nl</artifactId>

View File

@@ -2,6 +2,6 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Metadata Managment UI Nl Fragment
Bundle-SymbolicName: org.talend.metadata.managment.ui.nl
Bundle-Version: 7.3.1.qualifier
Bundle-Version: 7.2.1.qualifier
Fragment-Host: org.talend.metadata.managment.ui
Bundle-Vendor: .Talend SA.

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.3.1-SNAPSHOT</version>
<version>7.2.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.metadata.managment.ui.nl</artifactId>

View File

@@ -2,6 +2,6 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: MigrationTool Plug-in nl fragment
Bundle-SymbolicName: org.talend.migrationTool.nl
Bundle-Version: 7.3.1.qualifier
Bundle-Version: 7.2.1.qualifier
Bundle-Vendor: .Talend SA.
Fragment-Host: org.talend.migrationTool

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.3.1-SNAPSHOT</version>
<version>7.2.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.migrationTool.nl</artifactId>

View File

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName Nl Fragment
Bundle-SymbolicName: org.talend.model.edit.nl
Bundle-Version: 7.3.1.qualifier
Bundle-Version: 7.2.1.qualifier
Fragment-Host: org.talend.model.edit
Bundle-Localization: plugin
Bundle-Vendor: %providerName

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.3.1-SNAPSHOT</version>
<version>7.2.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.model.edit.nl</artifactId>

View File

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl
Bundle-SymbolicName: org.talend.model.migration.nl
Bundle-Version: 7.3.1.qualifier
Bundle-Version: 7.2.1.qualifier
Fragment-Host: org.talend.model.migration

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.3.1-SNAPSHOT</version>
<version>7.2.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.model.migration.nl</artifactId>

View File

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: org.talend.model.Nl Fragment
Bundle-SymbolicName: org.talend.model.nl
Bundle-Version: 7.3.1.qualifier
Bundle-Version: 7.2.1.qualifier
Bundle-Vendor: .Talend SA.
Fragment-Host: org.talend.model
Bundle-Localization: plugin

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.3.1-SNAPSHOT</version>
<version>7.2.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.model.nl</artifactId>

View File

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: NL
Bundle-SymbolicName: org.talend.presentation.onboarding.nl
Bundle-Version: 7.3.1.qualifier
Bundle-Version: 7.2.1.qualifier
Fragment-Host: org.talend.presentation.onboarding

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.3.1-SNAPSHOT</version>
<version>7.2.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.presentation.onboarding.nl</artifactId>

View File

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl Fragment
Bundle-SymbolicName: org.talend.rcp.nl
Bundle-Version: 7.3.1.qualifier
Bundle-Version: 7.2.1.qualifier
Fragment-Host: org.talend.rcp
Bundle-Localization: plugin
Bundle-Vendor: .Talend SA.

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.3.1-SNAPSHOT</version>
<version>7.2.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.rcp.nl</artifactId>

View File

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl
Bundle-SymbolicName: org.talend.registration.nl
Bundle-Version: 7.3.1.qualifier
Bundle-Version: 7.2.1.qualifier
Fragment-Host: org.talend.registration

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.3.1-SNAPSHOT</version>
<version>7.2.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.registration.nl</artifactId>

View File

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl
Bundle-SymbolicName: org.talend.repository.items.importexport.nl
Bundle-Version: 7.3.1.qualifier
Bundle-Version: 7.2.1.qualifier
Fragment-Host: org.talend.repository.items.importexport

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.3.1-SNAPSHOT</version>
<version>7.2.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.repository.items.importexport.nl</artifactId>

View File

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl Fragment
Bundle-SymbolicName: org.talend.repository.items.importexport.ui.nl
Bundle-Version: 7.3.1.qualifier
Bundle-Version: 7.2.1.qualifier
Fragment-Host: org.talend.repository.items.importexport.ui

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.3.1-SNAPSHOT</version>
<version>7.2.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.repository.items.importexport.ui.nl</artifactId>

View File

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Local repository Plug-in Nl Fragment
Bundle-SymbolicName: org.talend.repository.localprovider.nl
Bundle-Version: 7.3.1.qualifier
Bundle-Version: 7.2.1.qualifier
Fragment-Host: org.talend.repository.localprovider
Bundle-Localization: plugin
Bundle-Vendor: .Talend SA.

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.3.1-SNAPSHOT</version>
<version>7.2.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.repository.localprovider.nl</artifactId>

View File

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl
Bundle-SymbolicName: org.talend.repository.mdm.nl
Bundle-Version: 7.3.1.qualifier
Bundle-Version: 7.2.1.qualifier
Fragment-Host: org.talend.repository.mdm

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.3.1-SNAPSHOT</version>
<version>7.2.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.repository.mdm.nl</artifactId>

View File

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl
Bundle-SymbolicName: org.talend.repository.metadata.nl
Bundle-Version: 7.3.1.qualifier
Bundle-Version: 7.2.1.qualifier
Fragment-Host: org.talend.repository.metadata

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.3.1-SNAPSHOT</version>
<version>7.2.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.repository.metadata.nl</artifactId>

View File

@@ -2,6 +2,6 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl Fragment
Bundle-SymbolicName: org.talend.repository.view.nl
Bundle-Version: 7.3.1.qualifier
Bundle-Version: 7.2.1.qualifier
Fragment-Host: org.talend.repository.view
Bundle-Vendor: .Talend SA.

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.3.1-SNAPSHOT</version>
<version>7.2.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.repository.view.nl</artifactId>

View File

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nl Fragment
Bundle-SymbolicName: org.talend.resources.nl
Bundle-Version: 7.3.1.qualifier
Bundle-Version: 7.2.1.qualifier
Fragment-Host: org.talend.resources

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.3.1-SNAPSHOT</version>
<version>7.2.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.resources.nl</artifactId>

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature id="org.talend.commons.feature" label="Commons Feature" version="7.3.1.qualifier" provider-name=".Talend SA.">
<feature id="org.talend.commons.feature" label="Commons Feature" version="7.2.1.qualifier" provider-name=".Talend SA.">
<description url="http://www.talend.com/online/featuresdescription.html#commons-feature">Complete description about this feature at http://www.talend.com/online/featuresdescription.html#commons-feature</description>
<copyright url="http://www.talend.com/online/copyright.txt">Copyright Talend 2006, 2007</copyright>
<license>The licence are describe in branding feature</license>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.3.1-SNAPSHOT</version>
<version>7.2.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.commons.feature</artifactId>

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature id="org.talend.core.feature" label="Core Feature" version="7.3.1.qualifier" provider-name=".Talend SA.">
<feature id="org.talend.core.feature" label="Core Feature" version="7.2.1.qualifier" provider-name=".Talend SA.">
<description url="http://www.talend.com/online/featuresdescription.html#core-feature">Complete description about this feature at http://www.talend.com/online/featuresdescription.html#core-feature</description>
<copyright url="http://www.talend.com/online/copyright.txt">Copyright Talend 2006, 2007</copyright>
<license>The licence are describe in branding feature</license>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.3.1-SNAPSHOT</version>
<version>7.2.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.core.feature</artifactId>

View File

@@ -2,7 +2,7 @@
<feature
id="org.talend.fragment.jars.common.feature"
label="Fragment Jars in Common"
version="7.3.1.qualifier">
version="7.2.1.qualifier">
<description url="http://www.example.com/description">
[Enter Feature Description here.]
@@ -51,17 +51,16 @@
fragment="true"/>
<plugin
id="org.talend.libraries.apache.lucene8"
id="org.talend.libraries.apache.lucene6"
download-size="0"
install-size="0"
version="0.0.0"
unpack="true"/>
version="0.0.0"/>
<plugin
id="org.talend.libraries.apache.lucene4"
download-size="0"
install-size="0"
version="0.0.0"
unpack="true"/>
unpack="false"/>
</feature>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.3.1-SNAPSHOT</version>
<version>7.2.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.fragment.jars.common.feature</artifactId>

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature id="org.talend.help.feature" label="Help Feature" version="7.3.1.qualifier" provider-name=".Talend SA.">
<feature id="org.talend.help.feature" label="Help Feature" version="7.2.1.qualifier" provider-name=".Talend SA.">
<description url="http://www.talend.com/online/featuresdescription.html#help-feature">Complete description about this feature at http://www.talend.com/online/featuresdescription.html#help-feature</description>
<copyright url="http://www.talend.com/online/copyright.txt">Copyright Talend 2006, 2007</copyright>
<license>The licence are describe in branding feature</license>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.3.1-SNAPSHOT</version>
<version>7.2.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.help.feature</artifactId>

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature id="org.talend.jdt.feature" label="Feature" version="7.3.1.qualifier">
<feature id="org.talend.jdt.feature" label="Feature" version="7.2.1.qualifier">
<description url="http://www.example.com/description">[Enter Feature Description here.]</description>
<copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>
<license url="http://www.example.com/license">[Enter License Description here.]</license>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.3.1-SNAPSHOT</version>
<version>7.2.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.jdt.feature</artifactId>

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature id="org.talend.libraries.jdbc.feature" label="Jdbc_feature Feature" version="7.3.1.qualifier" provider-name=".Talend SA.">
<feature id="org.talend.libraries.jdbc.feature" label="Jdbc_feature Feature" version="7.2.1.qualifier" provider-name=".Talend SA.">
<description url="http://www.example.com/description">[Enter Feature Description here.]</description>
<copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>
<license url="http://www.example.com/license">[Enter License Description here.]</license>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.3.1-SNAPSHOT</version>
<version>7.2.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.jdbc.feature</artifactId>

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature id="org.talend.m2e.feature" label="Feature" version="7.3.1.qualifier">
<feature id="org.talend.m2e.feature" label="Feature" version="7.2.1.qualifier">
<description url="http://www.example.com/description">[Enter Feature Description here.]</description>
<copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>
<license url="http://www.example.com/license">[Enter License Description here.]</license>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.3.1-SNAPSHOT</version>
<version>7.2.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.m2e.feature</artifactId>

View File

@@ -2,7 +2,7 @@
<feature
id="org.talend.model.migration.feature"
label="model Migration feature"
version="7.3.1.qualifier">
version="7.2.1.qualifier">
<description url="http://www.example.com/description">
[Enter Feature Description here.]

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.3.1-SNAPSHOT</version>
<version>7.2.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.model.migration.feature</artifactId>

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature id="org.talend.platform.feature" label="Platform" version="7.3.1.qualifier">
<feature id="org.talend.platform.feature" label="Platform" version="7.2.1.qualifier">
<description url="http://www.example.com/description">[Enter Feature Description here.]</description>
<copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>
<license url="http://www.example.com/license">[Enter License Description here.]</license>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.3.1-SNAPSHOT</version>
<version>7.2.1</version>
<relativePath>../../../</relativePath>
</parent>

View File

@@ -2,7 +2,7 @@
<feature
id="org.talend.rcp.feature"
label="RCP Feature"
version="7.3.1.qualifier"
version="7.2.1.qualifier"
provider-name=".Talend SA.">
<description url="http://www.talend.com/online/featuresdescription.html#rcp-feature">

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.3.1-SNAPSHOT</version>
<version>7.2.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.rcp.feature</artifactId>

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature id="org.talend.update.p2.feature" label="P2-feature" version="7.3.1.qualifier">
<feature id="org.talend.update.p2.feature" label="P2-feature" version="7.2.1.qualifier">
<description url="http://www.example.com/description">[Enter Feature Description here.]</description>
<copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>
<license url="http://www.example.com/license">[Enter License Description here.]</license>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.3.1-SNAPSHOT</version>
<version>7.2.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.update.p2.feature</artifactId>

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature id="org.talend.updates.feature" label="Updates-feature" version="7.3.1.qualifier" provider-name=".Talend SA.">
<feature id="org.talend.updates.feature" label="Updates-feature" version="7.2.1.qualifier" provider-name=".Talend SA.">
<copyright url="http://www.talend.com/about-us">[Enter Copyright Description here.]</copyright>
<plugin id="org.talend.updates.runtime" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
</feature>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.3.1-SNAPSHOT</version>
<version>7.2.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.updates.feature</artifactId>

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature id="org.talend.utils.feature" label="Utils_feature Feature" version="7.3.1.qualifier">
<feature id="org.talend.utils.feature" label="Utils_feature Feature" version="7.2.1.qualifier">
<description url="http://www.example.com/description">This feature contains the Talend utilities plugin and its dependencies.</description>
<copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>
<license url="http://www.example.com/license">[Enter License Description here.]</license>
@@ -20,10 +20,8 @@
<import plugin="org.apache.servicemix.bundles.avro" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.junit" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.slf4j.api" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.apache.commons.configuration" version="2.0.0" match="greaterOrEqual"/>
</requires>
<plugin id="org.talend.daikon" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
<plugin id="org.talend.daikon.exception" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
<plugin id="org.talend.daikon.crypto.utils" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
<plugin id="org.talend.utils" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
</feature>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.3.1-SNAPSHOT</version>
<version>7.2.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.utils.feature</artifactId>

View File

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Common UI runtime Plug-in
Bundle-SymbolicName: org.talend.common.ui.runtime;singleton:=true
Bundle-Version: 7.3.1.qualifier
Bundle-Version: 7.2.1.qualifier
Require-Bundle: org.eclipse.core.runtime,
org.apache.commons.collections,
org.talend.libraries.dom4j-jaxen,

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.3.1-SNAPSHOT</version>
<version>7.2.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.common.ui.runtime</artifactId>

View File

@@ -21,6 +21,7 @@ import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Shell;
@@ -38,6 +39,8 @@ public class ExceptionMessageDialog extends MessageDialog {
private String exceptionString = null;
private int[] diabledButtonIndex = new int[] {};
public ExceptionMessageDialog(Shell parentShell, String dialogTitle, Image dialogTitleImage, String dialogMessage,
int dialogImageType, String[] dialogButtonLabels, int defaultIndex, Throwable ex) {
super(parentShell, dialogTitle, dialogTitleImage, dialogMessage, dialogImageType, dialogButtonLabels, defaultIndex);
@@ -147,4 +150,21 @@ public class ExceptionMessageDialog extends MessageDialog {
this.exceptionString = exceptionString;
}
public void setDisabledButtons(int[] index) {
this.diabledButtonIndex = index;
}
@Override
protected void createButtonsForButtonBar(Composite parent) {
super.createButtonsForButtonBar(parent);
if (diabledButtonIndex == null) {
return;
}
for (int index : diabledButtonIndex) {
Button button = super.getButton(index);
button.setEnabled(false);
}
}
}

View File

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Common Runtime Plug-in
Bundle-SymbolicName: org.talend.commons.runtime;singleton:=true
Bundle-Version: 7.3.1.qualifier
Bundle-Version: 7.2.1.qualifier
Require-Bundle: org.apache.log4j;visibility:=reexport,
org.apache.commons.beanutils,
org.apache.commons.collections,
@@ -13,7 +13,8 @@ Require-Bundle: org.apache.log4j;visibility:=reexport,
org.talend.libraries.apache,
com.ibm.icu,
org.apache.commons.io,
org.talend.utils
org.talend.utils,
org.eclipse.core.net
Export-Package: org.talend.commons,
org.talend.commons.exception,
org.talend.commons.i18n,

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>7.3.1-SNAPSHOT</version>
<version>7.2.1</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.commons.runtime</artifactId>

View File

@@ -12,7 +12,7 @@
<parent>
<groupId>org.talend</groupId>
<artifactId>org.talend.tos</artifactId>
<version>7.3.1-SNAPSHOT</version>
<version>7.2.1</version>
<relativePath>../pom_server.xml</relativePath>
</parent>

View File

@@ -17,6 +17,7 @@ import java.io.InputStream;
import java.net.URL;
import org.apache.commons.lang.ArrayUtils;
import org.eclipse.core.net.proxy.IProxyService;
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.preferences.InstanceScope;
@@ -24,6 +25,7 @@ import org.osgi.framework.Bundle;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
import org.osgi.util.tracker.ServiceTracker;
import org.talend.commons.exception.ExceptionService;
import org.talend.commons.runtime.debug.TalendDebugHandler;
import org.talend.commons.utils.system.EclipseCommandLine;
@@ -55,6 +57,8 @@ public class CommonsPlugin implements BundleActivator {
// TESB-17856: For commandline builds ESB Micorservice bundle
private static boolean isESBMicorservice = false;
private static ServiceTracker proxyTracker;
public static boolean isWorkbenchCreated() {
return isWorkbenchCreated;
}
@@ -114,9 +118,6 @@ public class CommonsPlugin implements BundleActivator {
return Boolean.getBoolean("junit_test"); //$NON-NLS-1$
}
public static boolean isTUJTest() {
return "org.talend.rcp.branding.tuj.product".equals(Platform.getProduct().getId()); //$NON-NLS-1$
}
/**
* Answer the file associated with name. This handles the case of running as a plugin and running standalone which
@@ -179,4 +180,13 @@ public class CommonsPlugin implements BundleActivator {
return FileLocator.toFileURL(entry);
}
public static IProxyService getProxyService() {
if (proxyTracker == null) {
proxyTracker = new ServiceTracker(Platform.getBundle(PLUGIN_ID).getBundleContext(), IProxyService.class.getName(),
null);
proxyTracker.open();
}
return (IProxyService) proxyTracker.getService();
}
}

View File

@@ -21,23 +21,29 @@ import javax.crypto.SecretKeyFactory;
import javax.crypto.spec.DESKeySpec;
import org.apache.commons.codec.binary.Base64;
import org.talend.utils.security.StudioEncryption;
import org.talend.utils.security.AESEncryption;
/**
* DOC chuang class global comment. Detailled comment
*/
public class PasswordEncryptUtil {
public static final String ENCRYPT_KEY = "Encrypt"; //$NON-NLS-1$
public static String ENCRYPT_KEY = "Encrypt"; //$NON-NLS-1$
private static String rawKey = "Talend-Key"; //$NON-NLS-1$
public static String PREFIX_PASSWORD = "ENC:["; //$NON-NLS-1$
public static String POSTFIX_PASSWORD = "]"; //$NON-NLS-1$
private static SecretKey key = null;
private static final SecureRandom SECURERANDOM = new SecureRandom();
private static SecureRandom secureRandom = new SecureRandom();
private static SecretKey getSecretKey() throws Exception {
if (key == null) {
byte rawKeyData[] = StudioEncryption.getKeySource(StudioEncryption.EncryptionKeyName.MIGRATION.toString(), false)
.getKey();
byte rawKeyData[] = rawKey.getBytes();
DESKeySpec dks = new DESKeySpec(rawKeyData);
SecretKeyFactory keyFactory = SecretKeyFactory.getInstance("DES"); //$NON-NLS-1$
key = keyFactory.generateSecret(dks);
@@ -59,7 +65,7 @@ public class PasswordEncryptUtil {
SecretKey key = getSecretKey();
Cipher c = Cipher.getInstance("DES"); //$NON-NLS-1$
c.init(Cipher.ENCRYPT_MODE, key, SECURERANDOM);
c.init(Cipher.ENCRYPT_MODE, key, secureRandom);
byte[] cipherByte = c.doFinal(input.getBytes());
String dec = new String(Base64.encodeBase64(cipherByte));
return dec;
@@ -79,7 +85,7 @@ public class PasswordEncryptUtil {
byte[] dec = Base64.decodeBase64(input.getBytes());
SecretKey key = getSecretKey();
Cipher c = Cipher.getInstance("DES"); //$NON-NLS-1$
c.init(Cipher.DECRYPT_MODE, key, SECURERANDOM);
c.init(Cipher.DECRYPT_MODE, key, secureRandom);
byte[] clearByte = c.doFinal(dec);
return new String(clearByte);
}
@@ -93,7 +99,7 @@ public class PasswordEncryptUtil {
if (input == null) {
return input;
}
return StudioEncryption.getStudioEncryption(StudioEncryption.EncryptionKeyName.ROUTINE).encrypt(input);
return PREFIX_PASSWORD + AESEncryption.encryptPassword(input) + POSTFIX_PASSWORD;
}
/**

View File

@@ -19,7 +19,6 @@ import java.io.InputStream;
import java.net.URISyntaxException;
import java.net.URL;
import java.util.Properties;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.commons.lang3.StringUtils;
@@ -46,6 +45,8 @@ public class VersionUtils {
public static final String STUDIO_VERSION_PROP = "studio.version"; //$NON-NLS-1$
public static final String TALEND_STUDIO_VERSION_PROP = "talend.studio.version"; //$NON-NLS-1$
public static final String TALEND_VERSION_PROP = "talend.version"; //$NON-NLS-1$
private static final String COMMONS_PLUGIN_ID = "org.talend.commons.runtime"; //$NON-NLS-1$
@@ -98,7 +99,9 @@ public class VersionUtils {
public static String getInternalVersion() {
if (Platform.inDevelopmentMode()) {
return getDisplayVersion();
String version = getDisplayVersion();
updateTalendStudioVersionProp(version);
return version;
}
if (productVersion == null) {
synchronized (VersionUtils.class) {
@@ -133,10 +136,15 @@ public class VersionUtils {
}
}
}
updateTalendStudioVersionProp(productVersion);
}
return productVersion;
}
private static void updateTalendStudioVersionProp(String version) {
System.setProperty(TALEND_STUDIO_VERSION_PROP, version == null ? "" : version);
}
/**
* DOC ycbai Comment method "getVersion".
*
@@ -193,27 +201,6 @@ public class VersionUtils {
return talendVersion;
}
public static String getTalendPureVersion(String fullProductVersion) {
String version = fullProductVersion;
String[] splitStr = fullProductVersion.split("-"); //$NON-NLS-1$
Pattern pattern = Pattern.compile("((\\d+\\.){2}\\d.*)"); //$NON-NLS-1$
StringBuffer versionStr = new StringBuffer();
boolean find = false;
for (String str : splitStr) {
if (find) {
versionStr.append("-").append(str); //$NON-NLS-1$
}else {
Matcher matcher = pattern.matcher(str);
if (matcher.find()) {
find = true;
versionStr.append(str); // $NON-NLS-1$
}
}
}
return getTalendVersion(versionStr.toString());
}
public static String getTalendVersion(String productVersion) {
try {
org.osgi.framework.Version v = new org.osgi.framework.Version(productVersion);

View File

@@ -0,0 +1,121 @@
// ============================================================================
//
// Copyright (C) 2006-2020 Talend Inc. - www.talend.com
//
// This source code is available under agreement available at
// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
//
// You should have received a copy of the agreement
// along with this program; if not, write to Talend SA
// 9 rue Pages 92150 Suresnes, France
//
// ============================================================================
package org.talend.commons.utils.database;
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.ArrayList;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
/**
* created by qiongli on 2013-11-13 Detailled comment
*
*/
public class Sybase16SADatabaseMetaData extends SybaseDatabaseMetaData {
private static Logger log = Logger.getLogger(Sybase16SADatabaseMetaData.class);
/**
* DOC qiongli SybaseIQDatabaseMetaData constructor comment.
*
* @param connection
* @throws SQLException
*/
public Sybase16SADatabaseMetaData(Connection connection) throws SQLException {
super(connection);
}
public ResultSet getCatalogs(String login, String database) throws SQLException {
List<String[]> list = new ArrayList<String[]>();
List<String> catList = new ArrayList<String>();
if (!StringUtils.isEmpty(database)) {
catList.add(database);
}
for (String catalogName : catList) {
String sql = createSqlByLoginAndCatalog(login, catalogName);
ResultSet rs = null;
Statement stmt = null;
try {
stmt = connection.createStatement();
rs = stmt.executeQuery(sql);
while (rs.next()) {
int temp = rs.getInt(1);
if (temp > 0) {
String[] r = new String[] { catalogName };
list.add(r);
}
}
} catch (SQLException e) {
log.error(e);
} finally {
try {
if (rs != null) {
rs.close();
}
if (stmt != null) {
stmt.close();
}
} catch (Exception e) {
log.error(e);
}
}
}
SybaseResultSet tableResultSet = new SybaseResultSet();
tableResultSet.setMetadata(new String[] { "TABLE_CAT" }); //$NON-NLS-1$
tableResultSet.setData(list);
return tableResultSet;
}
@Override
public ResultSet getColumns(String catalog, String schemaPattern, String tableNamePattern, String columnNamePattern)
throws SQLException {
return super.getColumns(null, schemaPattern, tableNamePattern, columnNamePattern);
}
@Override
public ResultSet getPrimaryKeys(String catalog, String schema, String table) throws SQLException {
return super.getPrimaryKeys(null, schema, table);
}
@Override
public ResultSet getTables(String catalog, String schemaPattern, String tableNamePattern, String[] types)
throws SQLException {
return super.getTables(null, schemaPattern, tableNamePattern, types);
}
/**
*
* get a sql query by login name and catalog name.
*
* @param loginName
* @param catalogName
* @return
*/
protected String createSqlByLoginAndCatalog(String loginName, String catalogName) {
String sql = "select count(*) from " + catalogName
+ ".dbo.sysusers where suid in (select suid from "+catalogName+".dbo.syslogins where name = '" + loginName
+ "')";
return sql;
}
}

View File

@@ -342,7 +342,7 @@ public class CharsetToolkit {
return (buffer[0] == -2 && buffer[1] == -1);
}
public static String getCharset(File file) {
public static String getCharset(File file){
String charset = "UTF-8";
byte[] fileContent = null;
FileInputStream fin = null;
@@ -350,18 +350,11 @@ public class CharsetToolkit {
fin = new FileInputStream(file.getPath());
fileContent = new byte[(int) file.length()];
fin.read(fileContent);
byte[] data = fileContent;
byte[] data = fileContent;
charset = getCharset(data);
} catch (IOException e) {
charset = "UTF-8";
} finally {
if (fin != null) {
try {
fin.close();
} catch (IOException e) {
// Ignore here
}
}
}
return charset;
}

View File

@@ -0,0 +1,18 @@
// ============================================================================
//
// Copyright (C) 2006-2020 Talend Inc. - www.talend.com
//
// This source code is available under agreement available at
// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
//
// You should have received a copy of the agreement
// along with this program; if not, write to Talend SA
// 9 rue Pages 92150 Suresnes, France
//
// ============================================================================
package org.talend.commons.utils.network;
public interface ITalendNexusPrefConstants {
public static final String NEXUS_TIMEOUT = "NEXUS_TIMEOUT"; //$NON-NLS-1$
}

Some files were not shown because too many files have changed in this diff Show More