Compare commits

..

35 Commits

Author SHA1 Message Date
hwang
b46a4f8eb0 TBD-2880:Remove deprecated hadoop version from wizard 2015-12-04 00:03:11 +08:00
hwang
951259fb81 Revert "TBD-2880:Remove deprecated hadoop version from wizard"
This reverts commit ba43de3f78.
2015-12-04 00:03:11 +08:00
Sizhao Liu
e853ca0e92 TUP-3822 bump exported jackson version in org.talend.libraries jackson 2015-12-04 00:03:11 +08:00
Igor Lazebny
b575923c99 TESB-16841: Introduce org.talend.utils.minimal build
Conflicts:
	main/plugins/org.talend.utils/pom_minimal.xml
2015-12-04 00:03:10 +08:00
Igor Lazebny
39c46176b7 TESB-16841: Embed daikon dependency in org.talend.utils bundle build 2015-12-04 00:03:10 +08:00
Sebastien Gandon
1cfc6bb252 TCOMP-12 : remove the maven (m2e) nature from the utils project 2015-12-04 00:03:09 +08:00
iwangtalend
dbe1433860 Deploy org.talend.utils to Nexus 2015-12-04 00:03:09 +08:00
Sebastien Gandon
5e91a5020f TCOMP-12 : added missing daikon to the org.talend.utils features 2015-12-04 00:03:08 +08:00
cmeng-talend
81fa236f82 TBD-2854 feature: support for cdh5.5
https://jira.talendforge.org/browse/TBD-2854
Conflicts:
	main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/connection/hive/HiveConnVersionInfo.java
2015-12-04 00:03:08 +08:00
Sebastien Gandon
10ed7e4197 TCOMP-12 : update feature with org.talend.utils to add daikon
Conflicts:
	main/features/org.talend.utils.feature/feature.xml
2015-12-04 00:03:08 +08:00
Sebastien Gandon
5b2946449b TCOMP-12: moved the CryptoHelper class to daikon 2015-12-04 00:03:07 +08:00
Sebastien Gandon
fc494b0346 TCOMP-12 : moved the CryptoHelper into daikon.
Conflicts:
	main/plugins/org.talend.utils/src/main/java/org/talend/utils/security/CryptoHelper.java
2015-12-04 00:03:07 +08:00
nrousseau
ea1a06bec2 TDI-34636: remove unused jars 2015-12-04 00:02:25 +08:00
nrousseau
152c02f006 TDI-34636: remove unused jars
Conflicts:
	main/features/org.talend.fragment.jars.feature/feature.xml
	main/plugins/org.talend.libraries.mdm/lib/cxf-core-3.1.4.jar
	main/plugins/org.talend.libraries.mdm/lib/cxf-rt-databinding-jaxb-3.1.4.jar
	main/plugins/org.talend.libraries.mdm/lib/cxf-rt-transports-http-3.1.4.jar
2015-12-04 00:02:25 +08:00
jzhao
8476e5cced TDI-30959: Support of Exasol 5 with Talend DI component
https://jira.talendforge.org/browse/TDI-30959
Note:Remove talend-db-exasol-1.0.0.jar and would move to other place
for TDI-34289
2015-12-04 00:02:24 +08:00
jzhao
dcc4c39d6e TDI-30959: Support of Exasol 5 with Talend DI component
https://jira.talendforge.org/browse/TDI-30959
Note: upload jar for TDI-34289
2015-12-04 00:02:24 +08:00
wdliu
1e752b99d2 TUP-3747: DI Studio Part
TUP-3747: Re-implement the copy to branch with the new
way.------Optimize the preivous implementation
2015-12-04 00:02:24 +08:00
rdubois
02e8726cbe TUP-3747 - FIXME - Fix a compilation error 2015-12-04 00:02:23 +08:00
Igor Lazebny
51e56344e0 Add minimal build of org.talend.commons.runtime 2015-12-04 00:02:23 +08:00
cmeng-talend
ac28766322 Revert "TUP-3628 fix bug: Exception in FixProjectResourceLink https://jira.talendforge.org/browse/TUP-3628"
This reverts commit b233d023b7.
2015-12-04 00:02:22 +08:00
cmeng-talend
039536471e Revert "TUP-3628 fix bug: Exception in FixProjectResourceLink"
This reverts commit b8aa3824a0.
2015-12-04 00:02:22 +08:00
xhkong
8d2a70deae Revert "TDI-32521 Renaming a generic schema is causing issue https://jira.talendforge.org/browse/TDI-32521"
This reverts commit 1abf29ab54.
2015-12-04 00:02:22 +08:00
xhkong
2517baaa8d Revert "TDI-32521 Renaming a generic schema is causing issue https://jira.talendforge.org/browse/TDI-32521"
This reverts commit 7479573feb.
2015-12-04 00:02:21 +08:00
cmeng-talend
138652edc1 TDI-34154 fix bug: Wrong schema retrieval with synonyms on Oracle
https://jira.talendforge.org/browse/TDI-34154

Also fix problem when check all synonyms
2015-12-04 00:02:21 +08:00
cmeng-talend
8926746847 TDI-34154 fix bug: Wrong schema retrieval with synonyms on Oracle
https://jira.talendforge.org/browse/TDI-34154
2015-12-04 00:02:20 +08:00
xhkong
313af1a25a TDI-32521 Renaming a generic schema is causing issue
https://jira.talendforge.org/browse/TDI-32521
2015-12-04 00:02:20 +08:00
xhkong
2082ad0ebc TDI-32521 Renaming a generic schema is causing issue
https://jira.talendforge.org/browse/TDI-32521
2015-12-04 00:02:20 +08:00
wchen-talend
7990806b74 TUP-3644:Build fails when a job contains two sub of the same subjobs
Conflicts:
	main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/tools/creator/CreateMavenJobPom.java
2015-12-04 00:02:19 +08:00
Chao Meng
26079474de TUP-3628 fix bug: Exception in FixProjectResourceLink
https://jira.talendforge.org/browse/TUP-3628

correct the comment
2015-12-04 00:02:19 +08:00
cmeng-talend
fc1cfc0b9c TUP-3628 fix bug: Exception in FixProjectResourceLink
https://jira.talendforge.org/browse/TUP-3628

Firstly try to get the file name from it's resource if exists
2015-12-04 00:02:18 +08:00
wluo-talend
c10279ef79 TUP-3614: Upgrade CXF to 3.1.3
https://jira.talendforge.org/browse/TUP-3614
2015-12-04 00:02:18 +08:00
wluo-talend
fe9a7640de TUP-3614: Upgrade CXF to 3.1.3
https://jira.talendforge.org/browse/TUP-3614
2015-12-04 00:02:18 +08:00
zwxue
94235104fe Revert "TDI-33924: Remove wrong Java setup warning when launching studio since JRE is supported now."
This reverts commit e6182a9da1.

Conflicts:
	main/plugins/org.talend.rcp/src/main/java/org/talend/rcp/intro/ApplicationWorkbenchWindowAdvisor.java
2015-12-04 00:02:17 +08:00
zwxue
47233aae94 TDI-33924: Remove wrong Java setup warning when launching studio since
JRE is supported now.
Conflicts:
	main/plugins/org.talend.rcp/src/main/java/org/talend/rcp/intro/ApplicationWorkbenchWindowAdvisor.java
2015-12-04 00:02:17 +08:00
wang wei
c727c8d707 TDI-33991: AWS EMR, On-Demand APIs (start, stop)
https://jira.talendforge.org/browse/TDI-33991
2015-12-04 00:02:16 +08:00
170 changed files with 316 additions and 342 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -559,7 +559,7 @@ repository.systemIndicators.businessRules=Business Rules
repository.systemIndicators.correlation=Correlation
repository.systemIndicators.functionalDependency=Functional Dependency
repository.systemIndicators.overview=Overview
repository.systemIndicators.patternFinder=Pattern Frequency Statistics
repository.systemIndicators.patternFinder=Pattern Frequncey Statistics
repository.systemIndicators.patternMatching=Pattern Matching
repository.systemIndicators.rowComparison=Row Comparison
repository.systemIndicators.simpleStatistics=Simple Statistics

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -107,4 +107,11 @@
version="0.0.0"
unpack="false"/>
<plugin
id="org.talend.daikon"
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>6.1.1</version>
<version>6.1.1-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.utils.feature</artifactId>

View File

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

View File

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

View File

@@ -48,57 +48,68 @@
<version>1.0</version>
<scope>system</scope>
<systemPath>${basedir}/fakejdbc_driver.jar</systemPath>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.birt.runtime</groupId>
<artifactId>org.eclipse.osgi</artifactId>
<version>3.10.2.v20150203-1939</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.birt.runtime</groupId>
<artifactId>org.eclipse.core.runtime</artifactId>
<version>3.10.0.v20140318-2214</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.birt.runtime</groupId>
<artifactId>org.eclipse.emf.common</artifactId>
<version>2.10.1.v20140901-1043</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.birt.runtime</groupId>
<artifactId>org.eclipse.emf.ecore</artifactId>
<version>2.10.1.v20140901-1043</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.birt.runtime</groupId>
<artifactId>org.eclipse.emf.ecore.xmi</artifactId>
<version>2.10.1.v20140901-1043</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.birt.runtime</groupId>
<artifactId>org.eclipse.equinox.common</artifactId>
<version>3.6.200.v20130402-1505</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.birt.runtime</groupId>
<artifactId>org.eclipse.equinox.registry</artifactId>
<version>3.5.400.v20140428-1507</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.birt.runtime</groupId>
<artifactId>org.eclipse.equinox.app</artifactId>
<version>1.3.200.v20130910-1609</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.11.0</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.16</version>
<type>bundle</type>
<optional>true</optional>
</dependency>
</dependencies>
@@ -110,8 +121,11 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
<source>1.7</source>
<target>1.7</target>
<includes>
<include>org/talend/commons/utils/threading/lockerbykey/*.java</include>
</includes>
</configuration>
</plugin>
<plugin>
@@ -122,8 +136,8 @@
<configuration>
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Embed-Dependency>artifactId=fakejdbc;inline=true</Embed-Dependency>
</instructions>
<classifier>minimal</classifier>
</configuration>
</plugin>
</plugins>

View File

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

View File

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

View File

@@ -63,8 +63,6 @@ public abstract class AbstractRepositoryFactory implements IRepositoryFactory {
private List<IRepositoryWorkUnitListener> listeners = new ArrayList<IRepositoryWorkUnitListener>();
private String storage;
@Override
public List<DynamicButtonBean> getButtons() {
return buttons;
@@ -316,14 +314,4 @@ public abstract class AbstractRepositoryFactory implements IRepositoryFactory {
public void updateLockStatus() throws PersistenceException {
// nothing to do, by default
}
@Override
public String getStorage() {
return this.storage;
}
@Override
public void setStorage(String storage) {
this.storage = storage;
}
}

View File

@@ -410,8 +410,4 @@ public interface IRepositoryFactory {
public boolean isModified(Object property);
public void afterLogon();
public void setStorage(String storage);
public String getStorage();
}

View File

@@ -270,7 +270,6 @@ public class DuplicateAction extends AContextualAction {
String sourceJobType = ConvertJobsUtil.getJobTypeFromFramework(newCreatedItem);
boolean isNeedConvert = ConvertJobsUtil.isNeedConvert(sourceJobType, sourceFramework, jobTypeValue,
frameworkNewValue);
boolean isNewItemCreated = false;
if (jobTypeValue != null && isNeedConvert) {
isAllowDuplicateTest = false;
try {
@@ -279,15 +278,12 @@ public class DuplicateAction extends AContextualAction {
.getProxyRepositoryFactory()
.getLastVersion(ProjectManager.getInstance().getCurrentProject(),
newCreatedItem.getProperty().getId());
isNewItemCreated = ConvertJobsUtil.convert(jobNewName, jobTypeValue, frameworkNewValue,
repositoryViewObject);
ConvertJobsUtil.convert(jobNewName, jobTypeValue, frameworkNewValue, repositoryViewObject);
} catch (Exception e) {
CommonExceptionHandler.process(e);
}
} else {
ConvertJobsUtil.updateFramework(newCreatedItem, frameworkNewValue);
}
if (!isNewItemCreated) {
// save the modifications
IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
@@ -316,6 +312,7 @@ public class DuplicateAction extends AContextualAction {
MessageBoxExceptionHandler.process(e.getCause());
}
}
}
} else {
InputDialog jobNewNameDialog = new InputDialog(null, Messages.getString("DuplicateAction.input.title.v2"), //$NON-NLS-1$

View File

@@ -26,6 +26,7 @@ import org.talend.commons.exception.BusinessException;
import org.talend.commons.exception.CommonExceptionHandler;
import org.talend.commons.exception.LoginException;
import org.talend.commons.exception.PersistenceException;
import org.talend.commons.ui.runtime.exception.MessageBoxExceptionHandler;
import org.talend.core.GlobalServiceRegister;
import org.talend.core.PluginChecker;
import org.talend.core.hadoop.HadoopConstants;
@@ -350,7 +351,7 @@ public class ConvertJobsUtil {
}
public static boolean convert(String newJobName, String jobTypeValue, String frameworkValue,
final IRepositoryViewObject sourceObject) throws CoreException {
final IRepositoryViewObject sourceObject) {
final Item newItem = ConvertJobsUtil.createOperation(newJobName, jobTypeValue, frameworkValue, sourceObject);
if (newItem == null) {
return false;
@@ -361,14 +362,14 @@ public class ConvertJobsUtil {
if (repositoryProperty != null) {
isNewItemCreated = (repositoryProperty.getItem() != newItem);
}
final IProxyRepositoryFactory proxyRepositoryFactory = CoreRuntimePlugin.getInstance().getProxyRepositoryFactory();
if (isNewItemCreated) {
// delete the old item
IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
@Override
public void run(final IProgressMonitor monitor) throws CoreException {
IProxyRepositoryFactory proxyRepositoryFactory = CoreRuntimePlugin.getInstance().getProxyRepositoryFactory();
try {
proxyRepositoryFactory.unlock(sourceObject);
proxyRepositoryFactory.deleteObjectPhysical(sourceObject);
@@ -382,31 +383,20 @@ public class ConvertJobsUtil {
};
// unlockObject();
// alreadyEditedByUser = true; // to avoid 2 calls of unlock
IWorkspace workspace = ResourcesPlugin.getWorkspace();
ISchedulingRule schedulingRule = workspace.getRoot();
// the update the project files need to be done in the workspace runnable to avoid all notification
// of changes before the end of the modifications.
workspace.run(runnable, schedulingRule, IWorkspace.AVOID_UPDATE, null);
} else if (sourceObject.getProperty() != null) {
IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
@Override
public void run(final IProgressMonitor monitor) throws CoreException {
try {
proxyRepositoryFactory.save(ProjectManager.getInstance().getCurrentProject(), sourceObject.getProperty()
.getItem(), false);
} catch (PersistenceException e1) {
CommonExceptionHandler.process(e1);
}
}
};
IWorkspace workspace = ResourcesPlugin.getWorkspace();
ISchedulingRule schedulingRule = workspace.getRoot();
workspace.run(runnable, schedulingRule, IWorkspace.AVOID_UPDATE, null);
try {
ISchedulingRule schedulingRule = workspace.getRoot();
// the update the project files need to be done in the workspace runnable to avoid all notification
// of changes before the end of the modifications.
workspace.run(runnable, schedulingRule, IWorkspace.AVOID_UPDATE, null);
return true;
} catch (CoreException e) {
MessageBoxExceptionHandler.process(e.getCause());
return false;
}
}
return isNewItemCreated;
return true;
}
/**

View File

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

View File

@@ -52,6 +52,12 @@ public enum EHadoopVersion4Drivers {
APACHE_1_0_0(EHadoopDistributions.APACHE, "Apache 1.0.0", "APACHE_1_0_0", true, false), //$NON-NLS-1$ //$NON-NLS-2$
CLOUDERA_CDH5_5(EHadoopDistributions.CLOUDERA, "Cloudera CDH5.5(YARN mode)", //$NON-NLS-1$
"Cloudera_CDH5_5", //$NON-NLS-1$
true,
false,
new EMRVersion[] { EMRVersion.YARN }),
CLOUDERA_CDH5_5(EHadoopDistributions.CLOUDERA, "Cloudera CDH5.5(YARN mode)", //$NON-NLS-1$
"Cloudera_CDH5_5", //$NON-NLS-1$
true,

View File

@@ -302,8 +302,8 @@ public class ERepositoryObjectType extends DynaEnum<ERepositoryObjectType> {
public final static ERepositoryObjectType SYSTEM_INDICATORS_OVERVIEW = new ERepositoryObjectType(
"repository.systemIndicators.overview", "TDQ_Libraries/Indicators/System Indicators/Overview", "SYSTEM_INDICATORS_OVERVIEW", 90, true, "repository.systemIndicators.overview.alias", new String[] { PROD_DQ }, new String[] {}, false); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
public final static ERepositoryObjectType SYSTEM_INDICATORS_PATTERN_FREQUENCY_STATISTICS = new ERepositoryObjectType(
"repository.systemIndicators.patternFinder", "TDQ_Libraries/Indicators/System Indicators/Pattern Frequency Statistics", "SYSTEM_INDICATORS_PATTERN_FINDER", 91, true, "repository.systemIndicators.patternFinder.alias", new String[] { PROD_DQ }, new String[] {}, false); //$NON-NLS-1$ //$NON-NLS-2$
public final static ERepositoryObjectType SYSTEM_INDICATORS_PATTERN_FREQUNCEY_STATISTICS = new ERepositoryObjectType(
"repository.systemIndicators.patternFinder", "TDQ_Libraries/Indicators/System Indicators/Pattern Frequncey Statistics", "SYSTEM_INDICATORS_PATTERN_FINDER", 91, true, "repository.systemIndicators.patternFinder.alias", new String[] { PROD_DQ }, new String[] {}, false); //$NON-NLS-1$ //$NON-NLS-2$
public final static ERepositoryObjectType SYSTEM_INDICATORS_PATTERN_MATCHING = new ERepositoryObjectType(
"repository.systemIndicators.patternMatching", "TDQ_Libraries/Indicators/System Indicators/Pattern Matching", "SYSTEM_INDICATORS_PATTERN_MATCHING", 92, true, "repository.systemIndicators.patternMatching.alias", new String[] { PROD_DQ }, new String[] {}, false); //$NON-NLS-1$ //$NON-NLS-2$

View File

@@ -18,8 +18,11 @@ import java.util.Map;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import org.talend.core.context.Context;
import org.talend.core.context.RepositoryContext;
import org.talend.core.database.EDatabaseTypeName;
import org.talend.core.database.conn.DatabaseConnStrUtil;
import org.talend.core.language.ECodeLanguage;
import org.talend.core.model.metadata.IMetadataTable;
import org.talend.core.model.metadata.builder.connection.DatabaseConnection;
import org.talend.core.model.metadata.builder.connection.Query;
@@ -28,6 +31,7 @@ import org.talend.core.model.process.IElement;
import org.talend.core.model.properties.DatabaseConnectionItem;
import org.talend.core.model.repository.IRepositoryViewObject;
import org.talend.core.model.utils.ContextParameterUtils;
import org.talend.core.runtime.CoreRuntimePlugin;
import org.talend.core.runtime.i18n.Messages;
import org.talend.core.utils.TalendQuoteUtils;
import org.talend.repository.model.RepositoryNode;
@@ -585,7 +589,10 @@ public class ConnectionParameters {
}
public static boolean isJavaProject() {
return true;
RepositoryContext repositoryContext = (RepositoryContext) CoreRuntimePlugin.getInstance().getContext()
.getProperty(Context.REPOSITORY_CONTEXT_KEY);
ECodeLanguage codeLanguage = repositoryContext.getProject().getLanguage();
return (codeLanguage == ECodeLanguage.JAVA);
}
public IMetadataTable getMetadataTable() {

View File

@@ -140,7 +140,7 @@ public class RepositoryImageProvider {
|| type == ERepositoryObjectType.SYSTEM_INDICATORS_CORRELATION
|| type == ERepositoryObjectType.SYSTEM_INDICATORS_FUNCTIONAL_DEPENDENCY
|| type == ERepositoryObjectType.SYSTEM_INDICATORS_OVERVIEW
|| type == ERepositoryObjectType.SYSTEM_INDICATORS_PATTERN_FREQUENCY_STATISTICS
|| type == ERepositoryObjectType.SYSTEM_INDICATORS_PATTERN_FREQUNCEY_STATISTICS
|| type == ERepositoryObjectType.SYSTEM_INDICATORS_PATTERN_MATCHING
|| type == ERepositoryObjectType.SYSTEM_INDICATORS_ROW_COMPARISON
|| type == ERepositoryObjectType.SYSTEM_INDICATORS_SIMPLE_STATISTICS

View File

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

View File

@@ -89,9 +89,6 @@ public class PerspectiveMenuManager extends MenuManager {
IWorkbench workbench = PlatformUI.getWorkbench();
IWorkbenchPage page = workbench.getActiveWorkbenchWindow().getActivePage();
if (page == null) {
return;
}
String activePersp = page.getPerspective().getId();
for (String perspId : perspectiveIds) {

View File

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

View File

@@ -1578,9 +1578,6 @@ public class ProcessorUtilities {
List<ProcessItem> testsItems = testContainerService.getAllTestContainers(parentJobInfo.getProcessItem());
for (ProcessItem testItem : testsItems) {
ProcessType testProcess = testContainerService.getTestContainerProcess(testItem);
if (testItem.getProcess() == null) {
testItem.setProcess(testProcess);
}
if (testProcess == null) {
log.warn(Messages.getString("ProcessorUtilities.nullProcess")); //$NON-NLS-1$
continue;

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -68,8 +68,7 @@ public class MavenUIService implements IMavenUIService {
// apply the user settings to MavenResolver
Dictionary<String, String> props = new Hashtable<String, String>();
if (studioUserSettingsFile != null && !"".equals(studioUserSettingsFile)) {
// props.put("org.ops4j.pax.url.mvn.settings", studioUserSettingsFile);
props.put("org.ops4j.pax.url.mvn.localRepository", MavenPlugin.getMaven().getLocalRepositoryPath());
props.put("org.ops4j.pax.url.mvn.settings", studioUserSettingsFile);
}
TalendLibsServerManager.getInstance().updateMavenResolver(props, setupRemoteRepository);
}

View File

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

View File

@@ -122,6 +122,14 @@ public class PomUtil {
return pomFileName;
}
public static String getPomFileName(String name, String version) {
String pomFileName = TalendMavenConstants.POM_FILE_NAME;
if (name != null && name.length() > 0) {
pomFileName = TalendMavenConstants.POM_NAME + '_' + name + "_" + version + TalendMavenConstants.XML_EXT;
}
return pomFileName;
}
/**
* get the assembly name, if name is null, return default one "assembly.xml", else will be
* "assembly_<name>_<version>.xml"

View File

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

View File

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

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1</version>
<version>6.1.1-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.apache.axis2</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1</version>
<version>6.1.1-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.apache.batik</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1</version>
<version>6.1.1-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.apache.cassandra</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1</version>
<version>6.1.1-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.apache.chemistry</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1</version>
<version>6.1.1-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.apache.common</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1</version>
<version>6.1.1-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.apache.cxf</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1</version>
<version>6.1.1-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.apache.google</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1</version>
<version>6.1.1-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.apache.http</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1</version>
<version>6.1.1-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.apache.lucene</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1</version>
<version>6.1.1-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.apache.lucene4</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1</version>
<version>6.1.1-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.apache.xml</artifactId>

View File

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

View File

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

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1</version>
<version>6.1.1-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.dom4j-jaxen</artifactId>

View File

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

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1</version>
<version>6.1.1-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.javacsv.jars</artifactId>

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>6.1.1</version>
<version>6.1.1-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.jdbc.jtds.jars</artifactId>

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