Compare commits
26 Commits
patch/TPS-
...
release/7.
| Author | SHA1 | Date | |
|---|---|---|---|
|
09158995e5 | ||
|
|
809df8e650 | ||
|
|
582e39400b | ||
|
|
ef3a63e4ee | ||
|
|
26c352d663 | ||
|
|
ef225da11f | ||
|
|
f9be88b165 | ||
|
|
b0246146fb | ||
|
|
507d646fa0 | ||
|
|
31a4b21a46 | ||
|
|
9fa336436f | ||
|
|
7942645db9 | ||
|
|
811346e69e | ||
|
|
724cd4c744 | ||
|
|
ac0cd8022c | ||
|
|
066edee112 | ||
|
|
8bf9342961 | ||
|
|
754be93890 | ||
|
|
a8bb0cce35 | ||
|
|
462f443cce | ||
|
|
eee2f2c52c | ||
|
|
d1430ccc38 | ||
|
|
26126638a3 | ||
|
|
9fd4279045 | ||
|
|
63efd72109 | ||
|
|
0810b915ef |
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.abstractmap.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.alfrescooutput.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.business.diagram.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.codegen.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.components.exchange.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.core.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.dbmap.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.documentation.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.fileoutputxml.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.gefabstractmap.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.mapper.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.maven.job.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.rowgenerator.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.runprocess.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.scd.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.webservice.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.xmlmap.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.expressionbuilder.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.presentation.onboarding.resource.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.presentation.onboarding.resource.tos.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.repository.ftp.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.repository.json.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.repository.nl</artifactId>
|
||||
|
||||
@@ -940,4 +940,3 @@ ImportProjectAction.messageDialogContent.projectImportedFinish=Project has been
|
||||
MavenGroupIdProjectSettingPage.groupIdLabel=Base GroupID:
|
||||
MavenGroupIdProjectSettingPage.appendFolderLabel=Append folder name to GroupID
|
||||
MavenGroupIdProjectSettingPage.groupIdErrMsg=Value is invalid.
|
||||
MavenGroupIdProjectSettingPage.pressOKMsg=Restart studio to apply changes.
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.repository.view.di.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.sbi.engines.client.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.spagic.engines.client.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.sqlbuilder.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.business.feature</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.feature</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.rcp.branding.tos.feature</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.rcp.branding.tos.test.feature</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.repository.feature</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.sbi.feature</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.spagic.feature</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.tos.components.feature</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.tos.feature</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.tos.libraries.feature</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.abstractmap</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.alfrescooutput</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.business.diagram</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.codegen</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.components.exchange</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.components.libs</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.components.localprovider</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.core.generic</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.core</artifactId>
|
||||
|
||||
@@ -96,6 +96,7 @@ import org.talend.designer.core.ui.views.problems.Problems;
|
||||
import org.talend.designer.core.ui.views.properties.ComponentSettings;
|
||||
import org.talend.designer.core.ui.views.properties.ComponentSettingsView;
|
||||
import org.talend.designer.core.utils.JavaProcessUtil;
|
||||
import org.talend.designer.core.utils.UnifiedComponentUtil;
|
||||
import org.talend.designer.runprocess.ProcessorException;
|
||||
import org.talend.designer.runprocess.ProcessorUtilities;
|
||||
import org.talend.repository.ProjectManager;
|
||||
@@ -842,4 +843,12 @@ public class DesignerCoreService implements IDesignerCoreService {
|
||||
preferenceStore.setValue(ITalendCorePrefConstants.PERFORMANCE_TAC_READ_TIMEOUT, timeout);
|
||||
}
|
||||
}
|
||||
|
||||
public boolean isDelegateNode(INode node) {
|
||||
if (node instanceof Node) {
|
||||
Node n = (Node) node;
|
||||
return UnifiedComponentUtil.isDelegateComponent(n.getDelegateComponent());
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.dbmap</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.documentation</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.filemultischemas</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.fileoutputxml</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.gefabstractmap</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.mapper.advanced</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.mapper</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.maven.job</artifactId>
|
||||
|
||||
@@ -14,6 +14,7 @@
|
||||
<outputDirectory>${file.separator}</outputDirectory>
|
||||
<includes>
|
||||
<include>${talend.job.path}/**</include>
|
||||
<include>__tdm/**</include>
|
||||
</includes>
|
||||
</fileSet>
|
||||
<fileSet>
|
||||
@@ -37,6 +38,13 @@
|
||||
<include>**</include>
|
||||
</includes>
|
||||
</fileSet>
|
||||
<fileSet>
|
||||
<directory>${current.resources.dir}</directory>
|
||||
<outputDirectory>${file.separator}</outputDirectory>
|
||||
<includes>
|
||||
<include>${talend.job.path}/**</include>
|
||||
</includes>
|
||||
</fileSet>
|
||||
</fileSets>
|
||||
<dependencySets>
|
||||
<!-- for all jobs -->
|
||||
|
||||
@@ -16,6 +16,7 @@
|
||||
<outputDirectory>${file.separator}</outputDirectory>
|
||||
<includes>
|
||||
<include>${talend.job.path}/**</include>
|
||||
<include>__tdm/**</include>
|
||||
</includes>
|
||||
</fileSet>
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.publish.core</artifactId>
|
||||
|
||||
@@ -110,34 +110,35 @@ public abstract class AbstractPublishJobAction implements IRunnableWithProgress
|
||||
|
||||
private void exportJobForOSGI(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
|
||||
File tmpJob = null;
|
||||
final ProcessItem processItem = (ProcessItem) node.getObject().getProperty().getItem();
|
||||
try {
|
||||
tmpJob = File.createTempFile("job", ".jar", null);
|
||||
jobScriptsManager = JobScriptsManagerFactory.createManagerInstance(
|
||||
JobScriptsManagerFactory.getDefaultExportChoiceMap(), processItem.getProcess().getDefaultContext(),
|
||||
JobScriptsManager.LAUNCHER_ALL, IProcessor.NO_STATISTICS, IProcessor.NO_TRACES, JobExportType.OSGI);
|
||||
// generate
|
||||
jobScriptsManager.setDestinationPath(tmpJob.getAbsolutePath());
|
||||
JobExportAction action = new JobExportAction(Collections.singletonList(node), jobVersion, bundleVersion,
|
||||
jobScriptsManager, System.getProperty("java.io.tmpdir"));
|
||||
tmpJob = File.createTempFile("item", ".jar", null);
|
||||
|
||||
action.run(monitor);
|
||||
if (!action.isBuildSuccessful()) {
|
||||
return;
|
||||
// TDI-32861, because for publish job, so means, must be binaries
|
||||
exportChoiceMap.put(ExportChoice.binaries, true);
|
||||
exportChoiceMap.put(ExportChoice.includeLibs, true);
|
||||
|
||||
ProcessItem processItem = (ProcessItem) node.getObject().getProperty().getItem();
|
||||
String contextName = (String) exportChoiceMap.get(ExportChoice.contextName);
|
||||
if (contextName == null) {
|
||||
contextName = processItem.getProcess().getDefaultContext();
|
||||
}
|
||||
BuildJobManager.getInstance().buildJob(tmpJob.getAbsolutePath(), processItem, jobVersion, contextName,
|
||||
exportChoiceMap, exportType, monitor);
|
||||
if (GlobalServiceRegister.getDefault().isServiceRegistered(IRunProcessService.class)) {
|
||||
IRunProcessService service = (IRunProcessService) GlobalServiceRegister.getDefault().getService(
|
||||
IRunProcessService.class);
|
||||
boolean hasError = service.checkExportProcess(new StructuredSelection(node), true);
|
||||
if (hasError) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
monitor.beginTask("Deploy to Artifact Repository....", IProgressMonitor.UNKNOWN);
|
||||
FeaturesModel featuresModel = getFeatureModel(tmpJob);
|
||||
|
||||
// [TESB-12036] add talend-data-mapper feature
|
||||
NodeType tHMapNode = EmfModelUtils.getComponentByName(processItem, THMAP_COMPONENT_NAME);
|
||||
if (tHMapNode != null) {
|
||||
featuresModel.addFeature(new FeatureModel(FeaturesModel.TALEND_DATA_MAPPER_FEATURE_NAME));
|
||||
}
|
||||
|
||||
processModules(featuresModel, ((JobJavaScriptOSGIForESBManager) jobScriptsManager).getExcludedModuleNeededs());
|
||||
|
||||
process(processItem, featuresModel, monitor);
|
||||
} catch (IOException e) {
|
||||
} catch (InterruptedException e) {
|
||||
throw e;
|
||||
} catch (Exception e) {
|
||||
throw new InvocationTargetException(e);
|
||||
} finally {
|
||||
if (tmpJob != null && tmpJob.exists()) {
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.rowgenerator</artifactId>
|
||||
|
||||
@@ -135,16 +135,6 @@
|
||||
name="RunProcess">
|
||||
</provider>
|
||||
</extension>
|
||||
<extension
|
||||
point="org.talend.core.repository.login.task">
|
||||
<loginTask
|
||||
class="org.talend.designer.runprocess.maven.CleanMavenFilesLoginTask">
|
||||
</loginTask>
|
||||
<loginTask
|
||||
class="org.talend.designer.runprocess.maven.MavenPomInstallLoginTask"
|
||||
priority="lowest">
|
||||
</loginTask>
|
||||
</extension>
|
||||
<extension
|
||||
point="org.talend.repository.projectsetting_page">
|
||||
<page
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.runprocess</artifactId>
|
||||
|
||||
@@ -18,6 +18,7 @@ import java.io.FileOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.net.URL;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Scanner;
|
||||
import java.util.Set;
|
||||
|
||||
@@ -30,6 +31,7 @@ import org.eclipse.core.runtime.CoreException;
|
||||
import org.eclipse.core.runtime.FileLocator;
|
||||
import org.eclipse.core.runtime.IPath;
|
||||
import org.eclipse.core.runtime.IProgressMonitor;
|
||||
import org.eclipse.core.runtime.NullProgressMonitor;
|
||||
import org.eclipse.core.runtime.Path;
|
||||
import org.eclipse.core.runtime.Platform;
|
||||
import org.eclipse.jdt.core.IJavaProject;
|
||||
@@ -53,6 +55,7 @@ import org.talend.core.model.process.IProcess;
|
||||
import org.talend.core.model.process.IProcess2;
|
||||
import org.talend.core.model.process.ProcessUtils;
|
||||
import org.talend.core.model.properties.ProcessItem;
|
||||
import org.talend.core.model.properties.ProjectReference;
|
||||
import org.talend.core.model.properties.Property;
|
||||
import org.talend.core.model.properties.RoutineItem;
|
||||
import org.talend.core.model.repository.ERepositoryObjectType;
|
||||
@@ -79,6 +82,7 @@ import org.talend.designer.runprocess.spark.SparkJavaProcessor;
|
||||
import org.talend.designer.runprocess.storm.StormJavaProcessor;
|
||||
import org.talend.designer.runprocess.ui.views.ProcessView;
|
||||
import org.talend.librariesmanager.model.ModulesNeededProvider;
|
||||
import org.talend.repository.ProjectManager;
|
||||
import org.talend.repository.RepositoryWorkUnit;
|
||||
import org.talend.repository.constants.Log4jPrefsConstants;
|
||||
import org.talend.repository.ui.utils.Log4jPrefsSettingManager;
|
||||
@@ -168,7 +172,8 @@ public class DefaultRunProcessService implements IRunProcessService {
|
||||
* boolean)
|
||||
*/
|
||||
@Override
|
||||
public IProcessor createCodeProcessor(IProcess process, Property property, ECodeLanguage language, boolean filenameFromLabel) {
|
||||
public IProcessor createCodeProcessor(IProcess process, Property property, ECodeLanguage language,
|
||||
boolean filenameFromLabel) {
|
||||
switch (language) {
|
||||
case JAVA:
|
||||
return createJavaProcessor(process, property, filenameFromLabel);
|
||||
@@ -247,8 +252,13 @@ public class DefaultRunProcessService implements IRunProcessService {
|
||||
}
|
||||
}
|
||||
} else {
|
||||
boolean isImportedRoute = RepositorySeekerManager.getInstance().searchRepoViewNode(property.getId(), false) == null;
|
||||
if (routeService != null && !isImportedRoute ) {
|
||||
boolean isImportedRoute = false;
|
||||
try {
|
||||
isImportedRoute = RepositorySeekerManager.getInstance().searchRepoViewNode(property.getId(), false) == null;
|
||||
} catch (Exception e) {
|
||||
System.out.println("Could not find the RepoViewNode according to " + property.getId());
|
||||
}
|
||||
if (routeService != null && !isImportedRoute) {
|
||||
return routeService.createJavaProcessor(process, property, filenameFromLabel, false);
|
||||
}
|
||||
}
|
||||
@@ -691,4 +701,27 @@ public class DefaultRunProcessService implements IRunProcessService {
|
||||
TalendJavaProjectManager.generatePom(processItem);
|
||||
}
|
||||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
*
|
||||
* @see org.talend.designer.runprocess.IRunProcessService#initializeRootPoms()
|
||||
*/
|
||||
@Override
|
||||
public void initializeRootPoms() {
|
||||
try {
|
||||
AggregatorPomsHelper helper = new AggregatorPomsHelper();
|
||||
helper.installRootPom(true);
|
||||
|
||||
List<ProjectReference> references = ProjectManager.getInstance().getCurrentProject().getProjectReferenceList(true);
|
||||
for (ProjectReference ref : references) {
|
||||
AggregatorPomsHelper refHelper = new AggregatorPomsHelper(ref.getReferencedProject().getTechnicalLabel());
|
||||
refHelper.installRootPom(true);
|
||||
}
|
||||
AggregatorPomsHelper.updateRefProjectModules(references);
|
||||
AggregatorPomsHelper.updateCodeProjects(new NullProgressMonitor(), true);
|
||||
} catch (Exception e) {
|
||||
ExceptionHandler.process(e);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -271,7 +271,9 @@ public class JobErrorsChecker {
|
||||
String errorMessage = null;
|
||||
try {
|
||||
HashSet<JobInfo> jobInfos = new HashSet<>();
|
||||
jobInfos.add(LastGenerationInfo.getInstance().getLastMainJob());
|
||||
if (LastGenerationInfo.getInstance().getLastMainJob() != null) {
|
||||
jobInfos.add(LastGenerationInfo.getInstance().getLastMainJob());
|
||||
}
|
||||
for (JobInfo jobInfo : jobInfos) {
|
||||
if (jobInfo.isTestContainer()) {
|
||||
continue;
|
||||
|
||||
@@ -72,6 +72,7 @@ import org.talend.designer.core.ui.editor.subjobcontainer.sparkstreaming.SparkSt
|
||||
import org.talend.designer.core.utils.ConnectionUtil;
|
||||
import org.talend.designer.core.utils.ParallelExecutionUtils;
|
||||
import org.talend.designer.maven.tools.BuildCacheManager;
|
||||
import org.talend.designer.maven.utils.PomUtil;
|
||||
import org.talend.designer.runprocess.ProcessMessage.MsgType;
|
||||
import org.talend.designer.runprocess.i18n.Messages;
|
||||
import org.talend.designer.runprocess.jmx.JMXPerformanceChangeListener;
|
||||
@@ -656,6 +657,7 @@ public class RunProcessContext {
|
||||
kill();
|
||||
}
|
||||
} finally {
|
||||
PomUtil.restorePomFile(processor.getTalendJavaProject());
|
||||
// progressMonitor.done();
|
||||
refreshUiAndWait[0] = false;
|
||||
}
|
||||
|
||||
@@ -444,4 +444,12 @@ public class RunProcessService implements IRunProcessService {
|
||||
delegateService.generateJobPom(processItem);
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.talend.designer.runprocess.IRunProcessService#initializeRootPoms()
|
||||
*/
|
||||
@Override
|
||||
public void initializeRootPoms() {
|
||||
delegateService.initializeRootPoms();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -1408,7 +1408,12 @@ public class JavaProcessor extends AbstractJavaProcessor implements IJavaBreakpo
|
||||
|
||||
@Override
|
||||
public Set<ModuleNeeded> getNeededModules() {
|
||||
Set<ModuleNeeded> neededLibraries = JavaProcessorUtilities.getNeededModulesForProcess(process);
|
||||
return getNeededModules(true);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Set<ModuleNeeded> getNeededModules(boolean withChildrenJobs) {
|
||||
Set<ModuleNeeded> neededLibraries = JavaProcessorUtilities.getNeededModulesForProcess(process, withChildrenJobs);
|
||||
boolean isLog4jEnabled = Boolean.parseBoolean(ElementParameterParser.getValue(process, "__LOG4J_ACTIVATE__")); //$NON-NLS-1$
|
||||
if (isLog4jEnabled) {
|
||||
JavaProcessorUtilities.addLog4jToModuleList(neededLibraries);
|
||||
|
||||
@@ -71,6 +71,8 @@ import org.talend.designer.core.model.utils.emf.talendfile.ProcessType;
|
||||
import org.talend.designer.core.ui.editor.process.Process;
|
||||
import org.talend.designer.core.utils.JavaProcessUtil;
|
||||
import org.talend.designer.maven.utils.PomUtil;
|
||||
import org.talend.designer.runprocess.ClasspathAdjusterProvider;
|
||||
import org.talend.designer.runprocess.IClasspathAdjuster;
|
||||
import org.talend.designer.runprocess.IRunProcessService;
|
||||
import org.talend.designer.runprocess.ProcessorException;
|
||||
import org.talend.designer.runprocess.ProcessorUtilities;
|
||||
@@ -140,8 +142,12 @@ public class JavaProcessorUtilities {
|
||||
libNames.addAll(PomUtil.getCodesExportJars(process));
|
||||
return libNames;
|
||||
}
|
||||
|
||||
|
||||
public static Set<ModuleNeeded> getNeededModulesForProcess(IProcess process) {
|
||||
return getNeededModulesForProcess(process, true);
|
||||
}
|
||||
|
||||
public static Set<ModuleNeeded> getNeededModulesForProcess(IProcess process, boolean withChildrens) {
|
||||
Set<ModuleNeeded> neededLibraries = new TreeSet<ModuleNeeded>(new Comparator<ModuleNeeded>() {
|
||||
|
||||
@Override
|
||||
@@ -150,13 +156,29 @@ public class JavaProcessorUtilities {
|
||||
}
|
||||
});
|
||||
|
||||
Set<ModuleNeeded> neededModules = LastGenerationInfo.getInstance().getModulesNeededWithSubjobPerJob(process.getId(),
|
||||
Set<ModuleNeeded> neededModules;
|
||||
if (withChildrens) {
|
||||
neededModules = LastGenerationInfo.getInstance().getModulesNeededWithSubjobPerJob(process.getId(),
|
||||
process.getVersion());
|
||||
} else {
|
||||
neededModules = LastGenerationInfo.getInstance().getModulesNeededPerJob(process.getId(),
|
||||
process.getVersion());
|
||||
Set<ModuleNeeded> neededModulesWithSubjobs = LastGenerationInfo.getInstance().getModulesNeededWithSubjobPerJob(process.getId(),
|
||||
process.getVersion());
|
||||
Iterator<ModuleNeeded> it = neededModules.iterator();
|
||||
while(it.hasNext()) {
|
||||
ModuleNeeded module = it.next();
|
||||
if (!neededModulesWithSubjobs.contains(module)) {
|
||||
// in case the classpath adjuster removed dependencies (cf use in ProcessorUtilities)
|
||||
it.remove();
|
||||
}
|
||||
}
|
||||
}
|
||||
neededLibraries.addAll(neededModules);
|
||||
|
||||
if (process == null || !(process instanceof IProcess2)) {
|
||||
if (neededLibraries.isEmpty() && process != null) {
|
||||
neededLibraries = process.getNeededModules(true);
|
||||
neededLibraries = process.getNeededModules(withChildrens);
|
||||
if (neededLibraries == null) {
|
||||
neededLibraries = new HashSet<ModuleNeeded>();
|
||||
// for (ModuleNeeded moduleNeeded : ModulesNeededProvider.getModulesNeeded()) {
|
||||
@@ -172,7 +194,16 @@ public class JavaProcessorUtilities {
|
||||
}
|
||||
Property property = ((IProcess2) process).getProperty();
|
||||
if (neededLibraries.isEmpty()) {
|
||||
neededLibraries = process.getNeededModules(true);
|
||||
neededLibraries = process.getNeededModules(withChildrens);
|
||||
|
||||
// not generating, so will run classpath adjuster only on this job
|
||||
List<IClasspathAdjuster> classPathAdjusters = ClasspathAdjusterProvider.getClasspathAdjuster();
|
||||
for (IClasspathAdjuster adjuster : classPathAdjusters) {
|
||||
adjuster.initialize();
|
||||
adjuster.collectInfo(process, neededLibraries);
|
||||
neededLibraries = adjuster.adjustClassPath(process, neededLibraries);
|
||||
}
|
||||
|
||||
if (neededLibraries == null) {
|
||||
neededLibraries = new HashSet<ModuleNeeded>();
|
||||
for (ModuleNeeded moduleNeeded : ModulesNeededProvider.getModulesNeeded()) {
|
||||
@@ -475,7 +506,7 @@ public class JavaProcessorUtilities {
|
||||
|
||||
});
|
||||
}
|
||||
} else {
|
||||
} else if (!Boolean.getBoolean("skip_missing_jars")) {
|
||||
throw new ProcessorException(missingJars);
|
||||
}
|
||||
|
||||
|
||||
@@ -12,19 +12,7 @@
|
||||
// ============================================================================
|
||||
package org.talend.designer.runprocess.java;
|
||||
|
||||
import static org.talend.designer.maven.model.TalendJavaProjectConstants.CLASSPATH_FILE_NAME;
|
||||
import static org.talend.designer.maven.model.TalendJavaProjectConstants.DIR_AGGREGATORS;
|
||||
import static org.talend.designer.maven.model.TalendJavaProjectConstants.DIR_BEANS;
|
||||
import static org.talend.designer.maven.model.TalendJavaProjectConstants.DIR_CODES;
|
||||
import static org.talend.designer.maven.model.TalendJavaProjectConstants.DIR_JOBS;
|
||||
import static org.talend.designer.maven.model.TalendJavaProjectConstants.DIR_PIGUDFS;
|
||||
import static org.talend.designer.maven.model.TalendJavaProjectConstants.DIR_PROCESS;
|
||||
import static org.talend.designer.maven.model.TalendJavaProjectConstants.DIR_PROCESS_MR;
|
||||
import static org.talend.designer.maven.model.TalendJavaProjectConstants.DIR_PROCESS_ROUTES;
|
||||
import static org.talend.designer.maven.model.TalendJavaProjectConstants.DIR_PROCESS_SERVICES;
|
||||
import static org.talend.designer.maven.model.TalendJavaProjectConstants.DIR_PROCESS_STORM;
|
||||
import static org.talend.designer.maven.model.TalendJavaProjectConstants.DIR_ROUTINES;
|
||||
import static org.talend.designer.maven.model.TalendJavaProjectConstants.PROJECT_FILE_NAME;
|
||||
import static org.talend.designer.maven.model.TalendJavaProjectConstants.*;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.ArrayList;
|
||||
@@ -73,9 +61,9 @@ import org.talend.core.runtime.process.ITalendProcessJavaProject;
|
||||
import org.talend.core.runtime.process.LastGenerationInfo;
|
||||
import org.talend.core.ui.ITestContainerProviderService;
|
||||
import org.talend.designer.core.IDesignerCoreService;
|
||||
import org.talend.designer.maven.model.TalendJavaProjectConstants;
|
||||
import org.talend.designer.maven.model.TalendMavenConstants;
|
||||
import org.talend.designer.maven.tools.AggregatorPomsHelper;
|
||||
import org.talend.designer.maven.tools.BuildCacheManager;
|
||||
import org.talend.designer.maven.tools.MavenPomSynchronizer;
|
||||
import org.talend.designer.maven.tools.creator.CreateMavenCodeProject;
|
||||
import org.talend.designer.maven.utils.MavenProjectUtils;
|
||||
@@ -111,14 +99,14 @@ public class TalendJavaProjectManager {
|
||||
// create poms folder.
|
||||
IFolder poms = createFolderIfNotExist(helper.getProjectPomsFolder(), monitor);
|
||||
|
||||
// deployments
|
||||
if (PluginChecker.isTIS()) {
|
||||
IFolder aggregators = createFolderIfNotExist(poms.getFolder(DIR_AGGREGATORS), monitor);
|
||||
IFile ciPomFile = aggregators.getFile(TalendJavaProjectConstants.FILE_POM_CI_BUILDER);
|
||||
if (!ciPomFile.exists()) {
|
||||
helper.createCIPom(ciPomFile, monitor);
|
||||
}
|
||||
}
|
||||
// // deployments
|
||||
// if (PluginChecker.isTIS()) {
|
||||
// IFolder aggregators = createFolderIfNotExist(poms.getFolder(DIR_AGGREGATORS), monitor);
|
||||
// IFile ciPomFile = aggregators.getFile(TalendJavaProjectConstants.FILE_POM_CI_BUILDER);
|
||||
// if (!ciPomFile.exists()) {
|
||||
// helper.createCIPom(ciPomFile, monitor);
|
||||
// }
|
||||
// }
|
||||
|
||||
// codes
|
||||
IFolder code = createFolderIfNotExist(poms.getFolder(DIR_CODES), monitor);
|
||||
@@ -185,6 +173,7 @@ public class TalendJavaProjectManager {
|
||||
AggregatorPomsHelper.updateCodeProjectPom(monitor, type, codeProject.getFile(TalendMavenConstants.POM_FILE_NAME));
|
||||
talendCodeJavaProject = new TalendProcessJavaProject(javaProject);
|
||||
talendCodeJavaProject.cleanMavenFiles(monitor);
|
||||
BuildCacheManager.getInstance().clearCache(type);
|
||||
talendCodeJavaProjects.put(type, talendCodeJavaProject);
|
||||
} catch (Exception e) {
|
||||
ExceptionHandler.process(e);
|
||||
@@ -306,10 +295,13 @@ public class TalendJavaProjectManager {
|
||||
while (iterator.hasNext()) {
|
||||
String key = iterator.next();
|
||||
ITalendProcessJavaProject project = talendJobJavaProjects.get(key);
|
||||
IPath jobPath = ItemResourceUtil.getItemRelativePath(project.getPropery());
|
||||
if (folderPath.isPrefixOf(jobPath)) {
|
||||
project.getProject().delete(deleteContent, true, null);
|
||||
iterator.remove();
|
||||
Property property = project.getPropery();
|
||||
if (property != null) {
|
||||
IPath jobPath = ItemResourceUtil.getItemRelativePath(property);
|
||||
if (folderPath.isPrefixOf(jobPath)) {
|
||||
project.getProject().delete(deleteContent, true, null);
|
||||
iterator.remove();
|
||||
}
|
||||
}
|
||||
}
|
||||
if (deleteContent) {
|
||||
@@ -334,9 +326,20 @@ public class TalendJavaProjectManager {
|
||||
for (IRepositoryViewObject object : allVersionObjects) {
|
||||
String realVersion = object.getVersion();
|
||||
Property property = object.getProperty();
|
||||
IPath jobPath = DeploymentConfsUtils.getJobEclipseProjectPath(property, realVersion);
|
||||
IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(jobPath.append(TalendMavenConstants.POM_FILE_NAME));
|
||||
AggregatorPomsHelper.removeFromParentModules(file);
|
||||
String currentName = property.getLabel();
|
||||
try {
|
||||
if (oldName != null) {
|
||||
property.setLabel(oldName);
|
||||
}
|
||||
IPath jobPath = DeploymentConfsUtils.getJobEclipseProjectPath(property, realVersion);
|
||||
IFile file = ResourcesPlugin.getWorkspace().getRoot()
|
||||
.getFile(jobPath.append(TalendMavenConstants.POM_FILE_NAME));
|
||||
AggregatorPomsHelper.removeFromParentModules(file);
|
||||
} finally {
|
||||
if (oldName != null) {
|
||||
property.setLabel(currentName);
|
||||
}
|
||||
}
|
||||
}
|
||||
Set<String> removedVersions = new HashSet<>();
|
||||
Iterator<String> iterator = talendJobJavaProjects.keySet().iterator();
|
||||
|
||||
@@ -31,8 +31,12 @@ import org.eclipse.core.runtime.Path;
|
||||
import org.eclipse.core.runtime.Status;
|
||||
import org.eclipse.jdt.core.IJavaProject;
|
||||
import org.talend.commons.exception.ExceptionHandler;
|
||||
import org.talend.commons.exception.PersistenceException;
|
||||
import org.talend.commons.utils.generation.JavaUtils;
|
||||
import org.talend.core.model.general.Project;
|
||||
import org.talend.core.model.properties.Property;
|
||||
import org.talend.core.model.repository.IRepositoryViewObject;
|
||||
import org.talend.core.repository.model.ProxyRepositoryFactory;
|
||||
import org.talend.core.runtime.process.ITalendProcessJavaProject;
|
||||
import org.talend.core.runtime.process.TalendProcessArgumentConstant;
|
||||
import org.talend.designer.maven.launch.MavenPomCommandLauncher;
|
||||
@@ -40,6 +44,7 @@ import org.talend.designer.maven.model.MavenSystemFolders;
|
||||
import org.talend.designer.maven.model.TalendMavenConstants;
|
||||
import org.talend.designer.maven.tools.MavenPomSynchronizer;
|
||||
import org.talend.designer.maven.utils.PomUtil;
|
||||
import org.talend.repository.ProjectManager;
|
||||
import org.talend.utils.io.FilesUtils;
|
||||
|
||||
/**
|
||||
@@ -50,11 +55,15 @@ public class TalendProcessJavaProject implements ITalendProcessJavaProject {
|
||||
|
||||
private IJavaProject javaProject;
|
||||
|
||||
private Property property;
|
||||
|
||||
private final MavenPomSynchronizer synchronizer;
|
||||
|
||||
private boolean useTempPom;
|
||||
|
||||
private String projectTechName;
|
||||
|
||||
private String id;
|
||||
|
||||
private String version;
|
||||
|
||||
public TalendProcessJavaProject(IJavaProject javaProject) {
|
||||
super();
|
||||
@@ -65,12 +74,26 @@ public class TalendProcessJavaProject implements ITalendProcessJavaProject {
|
||||
|
||||
public TalendProcessJavaProject(IJavaProject javaProject, Property property) {
|
||||
this(javaProject);
|
||||
this.property = property;
|
||||
this.id = property.getId();
|
||||
this.version = property.getVersion();
|
||||
projectTechName = ProjectManager.getInstance().getProject(property).getTechnicalLabel();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Property getPropery() {
|
||||
return property;
|
||||
ProxyRepositoryFactory factory = ProxyRepositoryFactory.getInstance();
|
||||
IRepositoryViewObject object;
|
||||
try {
|
||||
Project project = ProjectManager.getInstance().getProjectFromProjectTechLabel(projectTechName);
|
||||
object = factory.getSpecificVersion(project, id, version, true);
|
||||
} catch (PersistenceException e) {
|
||||
ExceptionHandler.process(e);
|
||||
return null;
|
||||
}
|
||||
if (object == null) {
|
||||
return null;
|
||||
}
|
||||
return object.getProperty();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -1,57 +0,0 @@
|
||||
// ============================================================================
|
||||
//
|
||||
// Copyright (C) 2006-2018 Talend Inc. - www.talend.com
|
||||
//
|
||||
// This source code is available under agreement available at
|
||||
// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
|
||||
//
|
||||
// You should have received a copy of the agreement
|
||||
// along with this program; if not, write to Talend SA
|
||||
// 9 rue Pages 92150 Suresnes, France
|
||||
//
|
||||
// ============================================================================
|
||||
package org.talend.designer.runprocess.maven;
|
||||
|
||||
import java.lang.reflect.InvocationTargetException;
|
||||
|
||||
import org.eclipse.core.runtime.IProgressMonitor;
|
||||
import org.eclipse.jface.operation.IRunnableWithProgress;
|
||||
import org.talend.login.AbstractLoginTask;
|
||||
|
||||
/**
|
||||
*
|
||||
* DOC ggu class global comment. Detailled comment
|
||||
*/
|
||||
public class CleanMavenFilesLoginTask extends AbstractLoginTask implements IRunnableWithProgress {
|
||||
|
||||
@Override
|
||||
public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
|
||||
// final IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
|
||||
//
|
||||
// @Override
|
||||
// public void run(IProgressMonitor monitor) {
|
||||
// try {
|
||||
// if (GlobalServiceRegister.getDefault().isServiceRegistered(IRunProcessService.class)) {
|
||||
// IRunProcessService service = (IRunProcessService) GlobalServiceRegister.getDefault().getService(
|
||||
// IRunProcessService.class);
|
||||
// ITalendProcessJavaProject talendProcessJavaProject = service.getTalendProcessJavaProject();
|
||||
// if (talendProcessJavaProject != null) {
|
||||
// talendProcessJavaProject.cleanMavenFiles(monitor);
|
||||
// }
|
||||
// }
|
||||
// } catch (Exception e) {
|
||||
// ExceptionHandler.process(e);
|
||||
// }
|
||||
// }
|
||||
// };
|
||||
//
|
||||
// try {
|
||||
// IWorkspace workspace = ResourcesPlugin.getWorkspace();
|
||||
// workspace.run(runnable, workspace.getRoot(), IWorkspace.AVOID_UPDATE, monitor);
|
||||
// } catch (CoreException e) {
|
||||
// throw new InvocationTargetException(e);
|
||||
// }
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@@ -253,6 +253,9 @@ public class MavenJavaProcessor extends JavaProcessor {
|
||||
}
|
||||
|
||||
public void generatePom(int option) {
|
||||
if (buildChildrenJobs != null) {
|
||||
buildChildrenJobs.clear();
|
||||
}
|
||||
initJobClasspath();
|
||||
try {
|
||||
IMavenPomCreator createTemplatePom = createMavenPomCreator();
|
||||
@@ -364,15 +367,7 @@ public class MavenJavaProcessor extends JavaProcessor {
|
||||
|
||||
buildCacheManager.buildAllSubjobMavenProjects();
|
||||
|
||||
if (CommonUIPlugin.isFullyHeadless()) {
|
||||
AggregatorPomsHelper.buildAndInstallCodesProject(monitor, ERepositoryObjectType.ROUTINES, false);
|
||||
if (ProcessUtils.isRequiredPigUDFs(null)) {
|
||||
AggregatorPomsHelper.buildAndInstallCodesProject(monitor, ERepositoryObjectType.PIG_UDF, false);
|
||||
}
|
||||
if (ProcessUtils.isRequiredBeans(null)) {
|
||||
AggregatorPomsHelper.buildAndInstallCodesProject(monitor, ERepositoryObjectType.valueOf("BEANS"), false); //$NON-NLS-1$
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
IFile jobJarFile = null;
|
||||
|
||||
@@ -1,56 +0,0 @@
|
||||
// ============================================================================
|
||||
//
|
||||
// Copyright (C) 2006-2018 Talend Inc. - www.talend.com
|
||||
//
|
||||
// This source code is available under agreement available at
|
||||
// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
|
||||
//
|
||||
// You should have received a copy of the agreement
|
||||
// along with this program; if not, write to Talend SA
|
||||
// 9 rue Pages 92150 Suresnes, France
|
||||
//
|
||||
// ============================================================================
|
||||
package org.talend.designer.runprocess.maven;
|
||||
|
||||
import java.lang.reflect.InvocationTargetException;
|
||||
import java.util.List;
|
||||
|
||||
import org.eclipse.core.runtime.IProgressMonitor;
|
||||
import org.eclipse.jface.operation.IRunnableWithProgress;
|
||||
import org.talend.commons.exception.ExceptionHandler;
|
||||
import org.talend.core.model.properties.ProjectReference;
|
||||
import org.talend.designer.maven.tools.AggregatorPomsHelper;
|
||||
import org.talend.login.AbstractLoginTask;
|
||||
import org.talend.repository.ProjectManager;
|
||||
|
||||
/**
|
||||
* created by ggu on 26 Mar 2015 Detailled comment
|
||||
*
|
||||
* install aggregator poms after all synchronize(codes file, java version settings) work done.
|
||||
*/
|
||||
public class MavenPomInstallLoginTask extends AbstractLoginTask implements IRunnableWithProgress {
|
||||
|
||||
@Override
|
||||
public boolean isCommandlineTask() {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
|
||||
try {
|
||||
AggregatorPomsHelper helper = new AggregatorPomsHelper();
|
||||
helper.installRootPom(true);
|
||||
|
||||
List<ProjectReference> references = ProjectManager.getInstance().getCurrentProject().getProjectReferenceList(true);
|
||||
for (ProjectReference ref : references) {
|
||||
AggregatorPomsHelper refHelper = new AggregatorPomsHelper(ref.getReferencedProject().getTechnicalLabel());
|
||||
refHelper.installRootPom(true);
|
||||
}
|
||||
AggregatorPomsHelper.updateRefProjectModules(references);
|
||||
AggregatorPomsHelper.updateCodeProjects(monitor);
|
||||
} catch (Exception e) {
|
||||
ExceptionHandler.process(e);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.runtime.visualization.tools</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.runtime.visualization</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.scd</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.spss</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.tutorials</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.unifiedcomponent</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.webservice</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.xmlmap</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.expressionbuilder</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.libraries.asm</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.libraries.bonita</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.libraries.crm</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.libraries.css</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.libraries.custom</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.libraries.edifact</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.libraries.ehcache</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.libraries.excel</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.libraries.ftp</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.libraries.groovy</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.libraries.guava</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.libraries.hadoop.mapr.5.0.0</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.libraries.jax</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.libraries.jersey</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.libraries.jetty</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.libraries.json</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tdi-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1-EP2</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.libraries.microsoft</artifactId>
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user