Compare commits

...

10 Commits

Author SHA1 Message Date
jzhao-talend
d8e1acc4ba chore(TPS-4718):change patch date 2021-04-06 14:53:37 +08:00
jzhao-talend
fb7b116afc fix(TPS-4718):add patch note 2021-03-03 11:36:16 +08:00
Dmytro Sylaiev
4c43d0e5e1 fix(TDI-41651): Add where clause support for update query (#4172) 2021-03-03 11:22:04 +08:00
Dmytro Sylaiev
80414947b5 fix(TDI-41651): Provide possibility to specify alias for output table… (#3645)
* fix(TDI-41651): Provide possibility to specify alias for output table ELT

* Do the same fix as mssqlELT

* Small refactoring for query codeGen

* fix(TDI-41651): Fix issues

* Correct notion in javaxml file

* Rename cleanUp method

* Use stringUtils in alias for input table

* fix(TDI-41651): Add getters for inner class

* fix(TDI-41651): Add missing property in pom.xml

* fix(TDI-41651): Add missing i18n label

* fix(TDI-41651): Remove use alias for output field

* fix(TDI-41651): Fix conflicts
2021-03-03 11:21:48 +08:00
nrousseau
9c31c2869d fix(TDI-42522) add option to deactivate component log 2019-06-19 18:58:02 +08:00
Jane Ding
e91f8c1b5d fix(TUP-23506)Job use tsapconnection component run fail when use the (#3623) (#3633)
* fix(TUP-23506)Job use tsapconnection component run fail when use the
sapjco3.jar with a newer version 3.0.14.
https://jira.talendforge.org/browse/TUP-23506

* fix(TUP-23506)Job use tsapconnection component run fail when use the
sapjco3.jar with a newer version 3.0.14.
https://jira.talendforge.org/browse/TUP-23506

* fix(TUP-23506)Job use tsapconnection component run fail when use the
sapjco3.jar with a newer version 3.0.14
https://jira.talendforge.org/browse/TUP-23506
2019-06-18 14:22:33 +08:00
hwang-talend
6d16ec2e3e bugfix(TUP-23510):There is compile error job in TDI demo project (#3632)
* bugfix(TUP-23510):There is compile error job in TDI demo project

* bugfix(TUP-23510):There is compile error job in TDI demo project (#3628)
2019-06-18 12:11:46 +08:00
Chao MENG
d5dfa732da Cmeng/backport/7.2.1/tup 20054 tck refresh issue (#3624)
* fix(TUP-20054): Due to checking fields it is hard to type
credentials/data from the keyboard
https://jira.talendforge.org/browse/TUP-20054

* main/plugins/org.talend.sdk.component.studio-integration/src/main/java/org/talend/sdk/component/studio/ui/wizard/TaCoKitConfigurationWizard.java

* fix(TUP-20054): Due to checking fields it is hard to type
credentials/data from the keyboard
https://jira.talendforge.org/browse/TUP-20054

* fix(TUP-20054): Due to checking fields it is hard to type
credentials/data from the keyboard
https://jira.talendforge.org/browse/TUP-20054

* Cmeng/bugfix/tup 20054 fix junit issue (#3627)

* fix(TUP-20054): Due to checking fields it is hard to type
credentials/data from the keyboard
https://jira.talendforge.org/browse/TUP-20054

Fix junit issue

* add junit source

* add junit source

* fix(TUP-20054): Due to checking fields it is hard to type (#3630)

credentials/data from the keyboard
https://jira.talendforge.org/browse/TUP-20054

Fix junit issue
2019-06-18 11:29:06 +08:00
Antoine Parent
49d093c671 fix(): typo in a pattern (#3626)
fix a pattern used to display job status
2019-06-17 16:46:08 +02:00
Jenkins Continuous Build server
0f3b302525 Set version to 7.2.1 2019-06-14 11:49:03 +02:00
160 changed files with 905 additions and 421 deletions

63
PATCH_RELEASE_NOTE.md Normal file
View File

@@ -0,0 +1,63 @@
---
version: 7.2.1
module: https://talend.poolparty.biz/coretaxonomy/42
product:
- https://talend.poolparty.biz/coretaxonomy/23
---
# TPS-4718
| Info | Value |
| ---------------- | ---------------- |
| Patch Name | Patch\_20210409\_TPS-4718\_v1-7.2.1 |
| Release Date | 2021-04-09 |
| Target Version | 20190620_1446-V7.2.1 |
| Product affected | Talend Studio |
## Introduction
This is a self-contained patch.
**NOTE**: For information on how to obtain this patch, reach out to your Support contact at Talend.
## Fixed issues
This patch contains the following fixes:
- [7.2.1] Issue when updating snowflake table using tELTOutput (TDI-41651)
## Prerequisites
Consider the following requirements for your system:
- Talend Studio 7.2.1 must be installed.
- This patch is depend on TUP patch **TPS-4713**.
## Installation
**NOTE**: If the patch is deployed in the approach Installing the patch using Talend Studio, the folder configuration under this patch must be replaced manually.
### Installing the patch using Software update
1) Logon TAC and switch to Configuration->Software Update, then enter the correct values and save referring to the documentation: https://help.talend.com/reader/f7Em9WV_cPm2RRywucSN0Q/j9x5iXV~vyxMlUafnDejaQ
2) Switch to Software update page, where the new patch will be listed. The patch can be downloaded from here into the nexus repository.
3) On Studio Side: Logon Studio with remote mode, on the logon page the Update button is displayed: click this button to install the patch.
### Installing the patch using Talend Studio
1) Create a folder named "patches" under your studio installer directory and copy the patch .zip file to this folder.
2) Restart your studio: a window pops up, then click OK to install the patch, or restart the commandline and the patch will be installed automatically.
### Installing the patch using Commandline
Execute the following commands:
1. Talend-Studio-win-x86_64.exe -nosplash -application org.talend.commandline.CommandLine -consoleLog -data commandline-workspace startServer -p 8002 --talendDebug
2. initRemote {tac_url} -ul {TAC login username} -up {TAC login password}
3. checkAndUpdate -tu {TAC login username} -tup {TAC login password}

View File

@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.talend.studio</groupId> <groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId> <artifactId>tdi-studio-se</artifactId>
<version>7.2.1-SNAPSHOT</version> <version>7.2.1</version>
<relativePath>../../../</relativePath> <relativePath>../../../</relativePath>
</parent> </parent>
<artifactId>org.talend.designer.abstractmap.nl</artifactId> <artifactId>org.talend.designer.abstractmap.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.talend.studio</groupId> <groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId> <artifactId>tdi-studio-se</artifactId>
<version>7.2.1-SNAPSHOT</version> <version>7.2.1</version>
<relativePath>../../../</relativePath> <relativePath>../../../</relativePath>
</parent> </parent>
<artifactId>org.talend.designer.alfrescooutput.nl</artifactId> <artifactId>org.talend.designer.alfrescooutput.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.talend.studio</groupId> <groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId> <artifactId>tdi-studio-se</artifactId>
<version>7.2.1-SNAPSHOT</version> <version>7.2.1</version>
<relativePath>../../../</relativePath> <relativePath>../../../</relativePath>
</parent> </parent>
<artifactId>org.talend.designer.business.diagram.nl</artifactId> <artifactId>org.talend.designer.business.diagram.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.talend.studio</groupId> <groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId> <artifactId>tdi-studio-se</artifactId>
<version>7.2.1-SNAPSHOT</version> <version>7.2.1</version>
<relativePath>../../../</relativePath> <relativePath>../../../</relativePath>
</parent> </parent>
<artifactId>org.talend.designer.codegen.nl</artifactId> <artifactId>org.talend.designer.codegen.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.talend.studio</groupId> <groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId> <artifactId>tdi-studio-se</artifactId>
<version>7.2.1-SNAPSHOT</version> <version>7.2.1</version>
<relativePath>../../../</relativePath> <relativePath>../../../</relativePath>
</parent> </parent>
<artifactId>org.talend.designer.components.exchange.nl</artifactId> <artifactId>org.talend.designer.components.exchange.nl</artifactId>

View File

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

View File

@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.talend.studio</groupId> <groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId> <artifactId>tdi-studio-se</artifactId>
<version>7.2.1-SNAPSHOT</version> <version>7.2.1</version>
<relativePath>../../../</relativePath> <relativePath>../../../</relativePath>
</parent> </parent>
<artifactId>org.talend.designer.dbmap.nl</artifactId> <artifactId>org.talend.designer.dbmap.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.talend.studio</groupId> <groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId> <artifactId>tdi-studio-se</artifactId>
<version>7.2.1-SNAPSHOT</version> <version>7.2.1</version>
<relativePath>../../../</relativePath> <relativePath>../../../</relativePath>
</parent> </parent>
<artifactId>org.talend.designer.documentation.nl</artifactId> <artifactId>org.talend.designer.documentation.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.talend.studio</groupId> <groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId> <artifactId>tdi-studio-se</artifactId>
<version>7.2.1-SNAPSHOT</version> <version>7.2.1</version>
<relativePath>../../../</relativePath> <relativePath>../../../</relativePath>
</parent> </parent>
<artifactId>org.talend.designer.fileoutputxml.nl</artifactId> <artifactId>org.talend.designer.fileoutputxml.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.talend.studio</groupId> <groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId> <artifactId>tdi-studio-se</artifactId>
<version>7.2.1-SNAPSHOT</version> <version>7.2.1</version>
<relativePath>../../../</relativePath> <relativePath>../../../</relativePath>
</parent> </parent>
<artifactId>org.talend.designer.gefabstractmap.nl</artifactId> <artifactId>org.talend.designer.gefabstractmap.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.talend.studio</groupId> <groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId> <artifactId>tdi-studio-se</artifactId>
<version>7.2.1-SNAPSHOT</version> <version>7.2.1</version>
<relativePath>../../../</relativePath> <relativePath>../../../</relativePath>
</parent> </parent>
<artifactId>org.talend.designer.mapper.nl</artifactId> <artifactId>org.talend.designer.mapper.nl</artifactId>

View File

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

View File

@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.talend.studio</groupId> <groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId> <artifactId>tdi-studio-se</artifactId>
<version>7.2.1-SNAPSHOT</version> <version>7.2.1</version>
<relativePath>../../../</relativePath> <relativePath>../../../</relativePath>
</parent> </parent>
<artifactId>org.talend.designer.rowgenerator.nl</artifactId> <artifactId>org.talend.designer.rowgenerator.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.talend.studio</groupId> <groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId> <artifactId>tdi-studio-se</artifactId>
<version>7.2.1-SNAPSHOT</version> <version>7.2.1</version>
<relativePath>../../../</relativePath> <relativePath>../../../</relativePath>
</parent> </parent>
<artifactId>org.talend.designer.runprocess.nl</artifactId> <artifactId>org.talend.designer.runprocess.nl</artifactId>

View File

@@ -52,7 +52,7 @@ ProcessDebugDialog.errortext=Impossible de d\u00E9bugger le job.\\nV\u00E9rifiez
ShadowProcess.notGeneratedOutputException=Sortie non g\u00E9n\u00E9r\u00E9e. ShadowProcess.notGeneratedOutputException=Sortie non g\u00E9n\u00E9r\u00E9e.
ProcessComposite.contextGroup=Contexte ProcessComposite.contextGroup=Contexte
prefs.clientConfiguration=Configuration du client Talend prefs.clientConfiguration=Configuration du client Talend
ProcessComposite.endPattern=Le Job {0} s\'est termin\u00E9 \u00E0 {1,date,HH:mm dd/MM/yyyy}. [code de sortie={2,number}] ProcessComposite.endPattern=Le Job {0} s'est termin\u00E9 \u00E0 {1,date,HH:mm dd/MM/yyyy}. [code de sortie={2,number}]
ProcessView.title=Ex\u00E9cuter({0}) ProcessView.title=Ex\u00E9cuter({0})
Processor.configurePerl=L'interpr\u00E9teur Perl n'est pas configur\u00E9. Processor.configurePerl=L'interpr\u00E9teur Perl n'est pas configur\u00E9.
JavaProcessor.notFoundedFolderException=Dossier introuvable dans le projet .Java JavaProcessor.notFoundedFolderException=Dossier introuvable dans le projet .Java

View File

@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.talend.studio</groupId> <groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId> <artifactId>tdi-studio-se</artifactId>
<version>7.2.1-SNAPSHOT</version> <version>7.2.1</version>
<relativePath>../../../</relativePath> <relativePath>../../../</relativePath>
</parent> </parent>
<artifactId>org.talend.designer.scd.nl</artifactId> <artifactId>org.talend.designer.scd.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.talend.studio</groupId> <groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId> <artifactId>tdi-studio-se</artifactId>
<version>7.2.1-SNAPSHOT</version> <version>7.2.1</version>
<relativePath>../../../</relativePath> <relativePath>../../../</relativePath>
</parent> </parent>
<artifactId>org.talend.designer.webservice.nl</artifactId> <artifactId>org.talend.designer.webservice.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.talend.studio</groupId> <groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId> <artifactId>tdi-studio-se</artifactId>
<version>7.2.1-SNAPSHOT</version> <version>7.2.1</version>
<relativePath>../../../</relativePath> <relativePath>../../../</relativePath>
</parent> </parent>
<artifactId>org.talend.designer.xmlmap.nl</artifactId> <artifactId>org.talend.designer.xmlmap.nl</artifactId>

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.talend.studio</groupId> <groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId> <artifactId>tdi-studio-se</artifactId>
<version>7.2.1-SNAPSHOT</version> <version>7.2.1</version>
<relativePath>../../../</relativePath> <relativePath>../../../</relativePath>
</parent> </parent>
<artifactId>org.talend.sbi.engines.client.nl</artifactId> <artifactId>org.talend.sbi.engines.client.nl</artifactId>

View File

@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.talend.studio</groupId> <groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId> <artifactId>tdi-studio-se</artifactId>
<version>7.2.1-SNAPSHOT</version> <version>7.2.1</version>
<relativePath>../../../</relativePath> <relativePath>../../../</relativePath>
</parent> </parent>
<artifactId>org.talend.spagic.engines.client.nl</artifactId> <artifactId>org.talend.spagic.engines.client.nl</artifactId>

View File

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

View File

@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.talend.studio</groupId> <groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId> <artifactId>tdi-studio-se</artifactId>
<version>7.2.1-SNAPSHOT</version> <version>7.2.1</version>
<relativePath>../../../</relativePath> <relativePath>../../../</relativePath>
</parent> </parent>
<artifactId>org.talend.designer.business.feature</artifactId> <artifactId>org.talend.designer.business.feature</artifactId>

View File

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

View File

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

View File

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

View File

@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.talend.studio</groupId> <groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId> <artifactId>tdi-studio-se</artifactId>
<version>7.2.1-SNAPSHOT</version> <version>7.2.1</version>
<relativePath>../../../</relativePath> <relativePath>../../../</relativePath>
</parent> </parent>
<artifactId>org.talend.rcp.branding.tos.test.feature</artifactId> <artifactId>org.talend.rcp.branding.tos.test.feature</artifactId>

View File

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

View File

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

View File

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

View File

@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.talend.studio</groupId> <groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId> <artifactId>tdi-studio-se</artifactId>
<version>7.2.1-SNAPSHOT</version> <version>7.2.1</version>
<relativePath>../../../</relativePath> <relativePath>../../../</relativePath>
</parent> </parent>
<artifactId>org.talend.tos.components.feature</artifactId> <artifactId>org.talend.tos.components.feature</artifactId>

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.talend.studio</groupId> <groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId> <artifactId>tdi-studio-se</artifactId>
<version>7.2.1-SNAPSHOT</version> <version>7.2.1</version>
<relativePath>../../../</relativePath> <relativePath>../../../</relativePath>
</parent> </parent>
<artifactId>org.talend.designer.business.diagram</artifactId> <artifactId>org.talend.designer.business.diagram</artifactId>

View File

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

View File

@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.talend.studio</groupId> <groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId> <artifactId>tdi-studio-se</artifactId>
<version>7.2.1-SNAPSHOT</version> <version>7.2.1</version>
<relativePath>../../../</relativePath> <relativePath>../../../</relativePath>
</parent> </parent>
<artifactId>org.talend.designer.components.exchange</artifactId> <artifactId>org.talend.designer.components.exchange</artifactId>

View File

@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.talend.studio</groupId> <groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId> <artifactId>tdi-studio-se</artifactId>
<version>7.2.1-SNAPSHOT</version> <version>7.2.1</version>
<relativePath>../../../</relativePath> <relativePath>../../../</relativePath>
</parent> </parent>
<artifactId>org.talend.designer.components.libs</artifactId> <artifactId>org.talend.designer.components.libs</artifactId>

View File

@@ -140,7 +140,15 @@
</PARAMETERS> </PARAMETERS>
<ADVANCED_PARAMETERS> <ADVANCED_PARAMETERS>
<PARAMETER
NAME="USE_UPDATE_STATEMENT"
FIELD="CHECK"
NUM_ROW="10"
SHOW_IF="DATA_ACTION=='UPDATE'"
>
<DEFAULT>false</DEFAULT>
</PARAMETER>
</ADVANCED_PARAMETERS> </ADVANCED_PARAMETERS>
<CODEGENERATION> <CODEGENERATION>

View File

@@ -35,6 +35,7 @@ skeleton="../templates/db_output_bulk.skeleton"
String differenttable = ElementParameterParser.getValue(node, "__DIFFERENT_TABLE_NAME__"); String differenttable = ElementParameterParser.getValue(node, "__DIFFERENT_TABLE_NAME__");
boolean useDifferentTable = "true".equals(ElementParameterParser.getValue(node, "__USE_DIFFERENT_TABLE__")); boolean useDifferentTable = "true".equals(ElementParameterParser.getValue(node, "__USE_DIFFERENT_TABLE__"));
boolean isTableNameVariable="true".equals(ElementParameterParser.getValue(node, "__IS_TABLE_NAME_VARIABLE__")); boolean isTableNameVariable="true".equals(ElementParameterParser.getValue(node, "__IS_TABLE_NAME_VARIABLE__"));
boolean useUpdateStatement="true".equals(ElementParameterParser.getValue(node, "__USE_UPDATE_STATEMENT__"));
%> %>
String select_query_<%=cid %> = null; String select_query_<%=cid %> = null;
String tableName_<%=cid%> = null; String tableName_<%=cid%> = null;
@@ -156,21 +157,36 @@ skeleton="../templates/db_output_bulk.skeleton"
} }
if(("INSERT").equals(dataAction)){ if(("INSERT").equals(dataAction)){
%> %>
String insertQuery_<%=cid %> = "INSERT INTO "+tableName_<%=cid%>+"(<%=insertColName.toString()%>) ("+select_query_<%=cid %>+")"; String insertQuery_<%=cid %> = "INSERT INTO "+tableName_<%=cid%>+"(<%=insertColName.toString()%>) ("+select_query_<%=cid %>+")";
<% <%
} else if (("UPDATE").equals(dataAction)){ } else if (("UPDATE").equals(dataAction)){
%> if(useUpdateStatement){
String updateQuery_<%=cid %> = "UPDATE "+tableName_<%=cid%>+" SET <%=updateSetStmt.toString()%> " %>
<% String updateQuery_<%=cid %> = select_query_<%=cid %>;
if(CodeGenerationUtils.hasAlphaNumericCharacter(whereClause)) { <%
%> if(CodeGenerationUtils.hasAlphaNumericCharacter(whereClause)) {
+" WHERE " + <%=CodeGenerationUtils.replaceAllCrBySpace(whereClause)%> %>
<% if (updateQuery_<%=cid %>.toUpperCase().contains(" WHERE ")) {
} updateQuery_<%=cid %> += " AND (" + <%=CodeGenerationUtils.replaceAllCrBySpace(whereClause)%> + ")";
%> } else {
; updateQuery_<%=cid %> += " WHERE " + <%=CodeGenerationUtils.replaceAllCrBySpace(whereClause)%>;
}
<%
}
} else {
%>
String updateQuery_<%=cid %> = "UPDATE "+tableName_<%=cid%>+" SET <%=updateSetStmt.toString()%> "
<%
if(CodeGenerationUtils.hasAlphaNumericCharacter(whereClause)) {
%>
+" WHERE " + <%=CodeGenerationUtils.replaceAllCrBySpace(whereClause)%>
<%
}
%>
;
<% <%
}
} else if (("DELETE").equals(dataAction)){ } else if (("DELETE").equals(dataAction)){
%> %>
String deleteQuery_<%=cid %> = "DELETE FROM "+ tableName_<%=cid%>+" WHERE EXISTS ("+select_query_<%=cid %>+") " String deleteQuery_<%=cid %> = "DELETE FROM "+ tableName_<%=cid%>+" WHERE EXISTS ("+select_query_<%=cid %>+") "

View File

@@ -40,4 +40,6 @@ TABLE_ACTION.ITEM.CREATE_IF_NOT_EXISTS=Create table if not exists
TABLE_ACTION.ITEM.DROP_IF_EXISTS_AND_CREATE=Drop table if exists and create TABLE_ACTION.ITEM.DROP_IF_EXISTS_AND_CREATE=Drop table if exists and create
TABLE_ACTION.ITEM.DROP_CREATE=Drop and create table TABLE_ACTION.ITEM.DROP_CREATE=Drop and create table
TABLE_ACTION.ITEM.NONE=None TABLE_ACTION.ITEM.NONE=None
TABLE_ACTION.NAME=Action on table TABLE_ACTION.NAME=Action on table
USE_UPDATE_STATEMENT.NAME=Use update statement without subqueries

View File

@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.talend.studio</groupId> <groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId> <artifactId>tdi-studio-se</artifactId>
<version>7.2.1-SNAPSHOT</version> <version>7.2.1</version>
<relativePath>../../../</relativePath> <relativePath>../../../</relativePath>
</parent> </parent>
<artifactId>org.talend.designer.components.localprovider</artifactId> <artifactId>org.talend.designer.components.localprovider</artifactId>

View File

@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.talend.studio</groupId> <groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId> <artifactId>tdi-studio-se</artifactId>
<version>7.2.1-SNAPSHOT</version> <version>7.2.1</version>
<relativePath>../../../</relativePath> <relativePath>../../../</relativePath>
</parent> </parent>
<artifactId>org.talend.designer.core.generic</artifactId> <artifactId>org.talend.designer.core.generic</artifactId>

View File

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

View File

@@ -1948,7 +1948,7 @@ public class DataProcess implements IGeneratingProcess {
} }
} }
if (duplicatedProcess.getComponentsType().equals(ComponentCategory.CATEGORY_4_DI.getName()) && PluginChecker.isTIS()) { if (duplicatedProcess.getComponentsType().equals(ComponentCategory.CATEGORY_4_DI.getName()) && PluginChecker.isTIS() && !Boolean.getBoolean("deactivate_extended_component_log")) {
final String talendJobLogComponent = "tJobStructureCatcher"; final String talendJobLogComponent = "tJobStructureCatcher";
final String uid4TalendJobLogComponent = "talendJobLog"; final String uid4TalendJobLogComponent = "talendJobLog";
IComponent jobStructComponent = ComponentsFactoryProvider.getInstance().get(talendJobLogComponent, ComponentCategory.CATEGORY_4_DI.getName()); IComponent jobStructComponent = ComponentsFactoryProvider.getInstance().get(talendJobLogComponent, ComponentCategory.CATEGORY_4_DI.getName());

View File

@@ -266,6 +266,9 @@ public class TextController extends AbstractElementPropertySectionController {
* @param value * @param value
*/ */
private void checkTextError(IElementParameter param, Text labelText, Object value) { private void checkTextError(IElementParameter param, Text labelText, Object value) {
if (elem instanceof Node) {
labelText.setToolTipText(VARIABLE_TOOLTIP + param.getVariableName());
}
// Only for job settings View. // Only for job settings View.
// job settings extra (feature 2710) // job settings extra (feature 2710)
if (param.getCategory() == EComponentCategory.STATSANDLOGS || param.getCategory() == EComponentCategory.EXTRA) { if (param.getCategory() == EComponentCategory.STATSANDLOGS || param.getCategory() == EComponentCategory.EXTRA) {

View File

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

View File

@@ -627,7 +627,7 @@ public abstract class DbGenerationManager {
int lstSizeOutTableEntries = metadataTableEntries.size(); int lstSizeOutTableEntries = metadataTableEntries.size();
for (int i = 0; i < lstSizeOutTableEntries; i++) { for (int i = 0; i < lstSizeOutTableEntries; i++) {
ExternalDbMapEntry dbMapEntry = metadataTableEntries.get(i); ExternalDbMapEntry dbMapEntry = metadataTableEntries.get(i);
String columnEntry = outTableName + DbMapSqlConstants.DOT + dbMapEntry.getName(); String columnEntry = dbMapEntry.getName();
String expression = dbMapEntry.getExpression(); String expression = dbMapEntry.getExpression();
expression = initExpression(component, dbMapEntry); expression = initExpression(component, dbMapEntry);
expression = addQuoteForSpecialChar(expression, component); expression = addQuoteForSpecialChar(expression, component);
@@ -674,13 +674,6 @@ public abstract class DbGenerationManager {
// From // From
appendSqlQuery(sb, tabSpaceString); appendSqlQuery(sb, tabSpaceString);
appendSqlQuery(sb, DbMapSqlConstants.FROM); appendSqlQuery(sb, DbMapSqlConstants.FROM);
appendSqlQuery(sb, DbMapSqlConstants.SPACE);
appendSqlQuery(sb, targetSchemaTable);
appendSqlQuery(sb, DbMapSqlConstants.NEW_LINE);
// Inner Join
appendSqlQuery(sb, tabSpaceString);
appendSqlQuery(sb, DbMapSqlConstants.INNER_JOIN);
List<ExternalDbMapTable> inputTables = data.getInputTables(); List<ExternalDbMapTable> inputTables = data.getInputTables();
// load input table in hash // load input table in hash
@@ -708,19 +701,14 @@ public abstract class DbGenerationManager {
if (language.unuseWithExplicitJoin().contains(joinType) && !explicitJoin) { if (language.unuseWithExplicitJoin().contains(joinType) && !explicitJoin) {
appendSqlQuery(sb, DbMapSqlConstants.SPACE); appendSqlQuery(sb, DbMapSqlConstants.SPACE);
appendSqlQuery(sb, inputTable.getTableName()); appendSqlQuery(sb, inputTable.getTableName());
appendSqlQuery(sb, DbMapSqlConstants.SPACE); String alias = inputTable.getAlias();
appendSqlQuery(sb, inputTable.getAlias()); if (org.apache.commons.lang.StringUtils.isNotEmpty(alias)) {
appendSqlQuery(sb, DbMapSqlConstants.SPACE);
appendSqlQuery(sb, alias);
}
} }
} }
// On
if (org.apache.commons.lang.StringUtils.isNotEmpty(keyColumn)) {
appendSqlQuery(sb, DbMapSqlConstants.NEW_LINE);
appendSqlQuery(sb, tabSpaceString);
appendSqlQuery(sb, DbMapSqlConstants.ON);
appendSqlQuery(sb, DbMapSqlConstants.SPACE);
appendSqlQuery(sb, keyColumn);
}
// where // where
StringBuilder sbWhere = new StringBuilder(); StringBuilder sbWhere = new StringBuilder();
this.tabSpaceString = DEFAULT_TAB_SPACE_STRING; this.tabSpaceString = DEFAULT_TAB_SPACE_STRING;
@@ -1014,7 +1002,7 @@ public abstract class DbGenerationManager {
*/ */
protected boolean buildConditions(DbMapComponent component, StringBuilder sb, ExternalDbMapTable inputTable, protected boolean buildConditions(DbMapComponent component, StringBuilder sb, ExternalDbMapTable inputTable,
boolean writeForJoin, boolean isFirstClause) { boolean writeForJoin, boolean isFirstClause) {
return buildConditions(component, sb, inputTable, writeForJoin, isFirstClause, false); return buildConditions(component, sb, inputTable, writeForJoin, isFirstClause, false);
} }
/** /**
@@ -1324,7 +1312,8 @@ public abstract class DbGenerationManager {
} }
protected String initExpression(DbMapComponent component, ExternalDbMapEntry dbMapEntry) { protected String initExpression(DbMapComponent component, ExternalDbMapEntry dbMapEntry) {
String quote = getQuote(component); String quote = getQuote(component);
String quto_mark = TalendQuoteUtils.QUOTATION_MARK;
String expression = dbMapEntry.getExpression(); String expression = dbMapEntry.getExpression();
if (expression != null) { if (expression != null) {
List<Map<String, String>> itemNameList = null; List<Map<String, String>> itemNameList = null;
@@ -1349,7 +1338,7 @@ public abstract class DbGenerationManager {
itemNameList = mapParser2.parseInTableEntryLocations(expression); itemNameList = mapParser2.parseInTableEntryLocations(expression);
} }
String quoParser = "[\\\\]?\\" + quote; //$NON-NLS-1$ String quto_markParser = "[\\\\]?\\" + quto_mark; //$NON-NLS-1$
for (Map<String, String> itemNamemap : itemNameList) { for (Map<String, String> itemNamemap : itemNameList) {
Set<Entry<String, String>> set = itemNamemap.entrySet(); Set<Entry<String, String>> set = itemNamemap.entrySet();
Iterator<Entry<String, String>> ite = set.iterator(); Iterator<Entry<String, String>> ite = set.iterator();
@@ -1415,16 +1404,12 @@ public abstract class DbGenerationManager {
} }
if (expression.trim().equals(tableValue + "." + oriName)) { if (expression.trim().equals(tableValue + "." + oriName)) {
expression = tableValue + "." + getColumnName(iconn, oriName, quote); expression = tableValue + "." + getColumnName(iconn, oriName, quote);
if(TalendQuoteUtils.QUOTATION_MARK.equals(quote)){ expression = expression.replaceAll(quto_markParser,"\\\\" +quto_mark); //$NON-NLS-1$
expression = expression.replaceAll(quoParser,"\\\\" +quote); //$NON-NLS-1$
}
continue; continue;
} }
if (expression.trim().equals(originaltableName + "." + oriName)) { if (expression.trim().equals(originaltableName + "." + oriName)) {
expression = originaltableName + "." + getColumnName(iconn, oriName, quote); expression = originaltableName + "." + getColumnName(iconn, oriName, quote);
if(TalendQuoteUtils.QUOTATION_MARK.equals(quote)){ expression = expression.replaceAll(quto_markParser,"\\\\" +quto_mark); //$NON-NLS-1$
expression = expression.replaceAll(quoParser,"\\\\" +quote); //$NON-NLS-1$
}
continue; continue;
} }
// if it is temp delived table, use label to generate sql // if it is temp delived table, use label to generate sql
@@ -1437,10 +1422,8 @@ public abstract class DbGenerationManager {
oriName = oriName.replaceAll("\\$", "\\\\\\$"); //$NON-NLS-1$ //$NON-NLS-2$ oriName = oriName.replaceAll("\\$", "\\\\\\$"); //$NON-NLS-1$ //$NON-NLS-2$
} }
expression = expression.replaceFirst(tableValue + "\\." + co.getLabel(), //$NON-NLS-1$ expression = expression.replaceFirst(tableValue + "\\." + co.getLabel(), //$NON-NLS-1$
tableValue + "\\." + oriName); //$NON-NLS-1$ tableValue + "\\." + oriName); //$NON-NLS-1$
if(TalendQuoteUtils.QUOTATION_MARK.equals(quote)){ expression = replaceAuotes(expression, quto_markParser, quto_mark);
expression = replaceAuotes(expression, quoParser, quote);
}
} }
} }
@@ -1493,23 +1476,23 @@ public abstract class DbGenerationManager {
} }
private String getQuote(DbMapComponent component){ private String getQuote(DbMapComponent component){
String quote = TalendQuoteUtils.QUOTATION_MARK; String quote = TalendQuoteUtils.QUOTATION_MARK;
IElementParameter mappingPara = component.getElementParameter(EParameterName.MAPPING.getName()); IElementParameter mappingPara = component.getElementParameter(EParameterName.MAPPING.getName());
if(mappingPara == null){ if(mappingPara == null){
return quote; return quote;
} }
String mapping = (String) mappingPara.getValue(); String mapping = (String) mappingPara.getValue();
if(mapping == null){ if(mapping == null){
return quote; return quote;
} }
MappingTypeRetriever mappingTypeRetriever = MetadataTalendType.getMappingTypeRetriever(mapping); MappingTypeRetriever mappingTypeRetriever = MetadataTalendType.getMappingTypeRetriever(mapping);
if (mappingTypeRetriever == null) { if (mappingTypeRetriever == null) {
return quote; return quote;
} }
Dbms dbms = mappingTypeRetriever.getDbms(); Dbms dbms = mappingTypeRetriever.getDbms();
String product = dbms.getProduct(); String product = dbms.getProduct();
EDatabaseTypeName type = EDatabaseTypeName.getTypeFromProductName(product); EDatabaseTypeName type = EDatabaseTypeName.getTypeFromProductName(product);
return TalendQuoteUtils.getQuoteByDBType(type); return TalendQuoteUtils.getQuoteByDBType(type);
} }
private String getOriginalColumnName(String entryName, DbMapComponent component, ExternalDbMapTable table) { private String getOriginalColumnName(String entryName, DbMapComponent component, ExternalDbMapTable table) {
@@ -1666,4 +1649,4 @@ public abstract class DbGenerationManager {
this.useDelimitedIdentifiers = useDelimitedIdentifiers; this.useDelimitedIdentifiers = useDelimitedIdentifiers;
} }
} }

View File

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

View File

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

View File

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

View File

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

View File

@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.talend.studio</groupId> <groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId> <artifactId>tdi-studio-se</artifactId>
<version>7.2.1-SNAPSHOT</version> <version>7.2.1</version>
<relativePath>../../../</relativePath> <relativePath>../../../</relativePath>
</parent> </parent>
<artifactId>org.talend.designer.mapper.advanced</artifactId> <artifactId>org.talend.designer.mapper.advanced</artifactId>

View File

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

View File

@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.talend.studio</groupId> <groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId> <artifactId>tdi-studio-se</artifactId>
<version>7.2.1-SNAPSHOT</version> <version>7.2.1</version>
<relativePath>../../../</relativePath> <relativePath>../../../</relativePath>
</parent> </parent>
<artifactId>org.talend.designer.maven.job</artifactId> <artifactId>org.talend.designer.maven.job</artifactId>

View File

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

View File

@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.talend.studio</groupId> <groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId> <artifactId>tdi-studio-se</artifactId>
<version>7.2.1-SNAPSHOT</version> <version>7.2.1</version>
<relativePath>../../../</relativePath> <relativePath>../../../</relativePath>
</parent> </parent>
<artifactId>org.talend.designer.publish.core</artifactId> <artifactId>org.talend.designer.publish.core</artifactId>

View File

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

View File

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

View File

@@ -1461,19 +1461,20 @@ public class JavaProcessor extends AbstractJavaProcessor implements IJavaBreakpo
break; break;
} }
} }
useRelativeClasspath = hasCXFComponent;
IFolder execPath = talendJavaProject.getTargetFolder(); IFolder execPath = talendJavaProject.getTargetFolder();
for (ModuleNeeded neededModule : neededModules) { for (ModuleNeeded neededModule : neededModules) {
MavenArtifact artifact = MavenUrlHelper.parseMvnUrl(neededModule.getMavenUri()); MavenArtifact artifact = MavenUrlHelper.parseMvnUrl(neededModule.getMavenUri());
String relativeJarPath = JavaProcessorUtilities.getJavaProjectLibFolder2() IPath jarPath = JavaProcessorUtilities.getJavaProjectLibFolder2()
.getFile(MavenUrlHelper.generateModuleNameByMavenURI(neededModule.getMavenUri())).getLocation() .getFile(MavenUrlHelper.generateModuleNameByMavenURI(neededModule.getMavenUri())).getLocation();
.makeRelativeTo(execPath.getLocation())
.toPortableString();
String artifactId = artifact.getArtifactId(); String artifactId = artifact.getArtifactId();
boolean hasSapjco3 = "sapjco3".equals(artifactId) && compareSapjco3Version(relativeJarPath) > 0; //$NON-NLS-1$ boolean hasSapjco3 = "sapjco3".equals(artifactId) //$NON-NLS-1$
&& compareSapjco3Version(jarPath.toPortableString()) > 0;
boolean hasSapidoc3 = "sapidoc3".equals(artifactId); //$NON-NLS-1$ boolean hasSapidoc3 = "sapidoc3".equals(artifactId); //$NON-NLS-1$
useRelativeClasspath = hasCXFComponent || hasSapjco3 || hasSapidoc3; if (hasCXFComponent) {
if (useRelativeClasspath) { libPath.append(jarPath.makeRelativeTo(execPath.getLocation()).toPortableString()).append(classPathSeparator);
libPath.append(relativeJarPath).append(classPathSeparator); } else if (hasSapjco3 || hasSapidoc3) {
libPath.append(jarPath.toPortableString()).append(classPathSeparator);
} else { } else {
libPath.append(PomUtil.getAbsArtifactPathAsCP(artifact)).append(classPathSeparator); libPath.append(PomUtil.getAbsArtifactPathAsCP(artifact)).append(classPathSeparator);
} }

View File

@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.talend.studio</groupId> <groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId> <artifactId>tdi-studio-se</artifactId>
<version>7.2.1-SNAPSHOT</version> <version>7.2.1</version>
<relativePath>../../../</relativePath> <relativePath>../../../</relativePath>
</parent> </parent>
<artifactId>org.talend.designer.runtime.visualization.tools</artifactId> <artifactId>org.talend.designer.runtime.visualization.tools</artifactId>

View File

@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.talend.studio</groupId> <groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId> <artifactId>tdi-studio-se</artifactId>
<version>7.2.1-SNAPSHOT</version> <version>7.2.1</version>
<relativePath>../../../</relativePath> <relativePath>../../../</relativePath>
</parent> </parent>
<artifactId>org.talend.designer.runtime.visualization</artifactId> <artifactId>org.talend.designer.runtime.visualization</artifactId>

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.talend.studio</groupId> <groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId> <artifactId>tdi-studio-se</artifactId>
<version>7.2.1-SNAPSHOT</version> <version>7.2.1</version>
<relativePath>../../../</relativePath> <relativePath>../../../</relativePath>
</parent> </parent>
<artifactId>org.talend.libraries.hadoop.mapr.5.0.0</artifactId> <artifactId>org.talend.libraries.hadoop.mapr.5.0.0</artifactId>

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.talend.studio</groupId> <groupId>org.talend.studio</groupId>
<artifactId>tdi-studio-se</artifactId> <artifactId>tdi-studio-se</artifactId>
<version>7.2.1-SNAPSHOT</version> <version>7.2.1</version>
<relativePath>../../../</relativePath> <relativePath>../../../</relativePath>
</parent> </parent>
<artifactId>org.talend.libraries.sqlbuilder.jars</artifactId> <artifactId>org.talend.libraries.sqlbuilder.jars</artifactId>

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