From 2165d0effe9fdfeb8e159cb2806fd2722d05abed Mon Sep 17 00:00:00 2001 From: apoltavtsev Date: Tue, 12 Sep 2023 18:55:48 +0200 Subject: [PATCH] Revert "APPINT-35897: Routelet version is corrected" --- .../java/org/talend/designer/runprocess/ProcessorUtilities.java | 2 +- .../designer/maven/tools/creator/AbstractMavenProcessorPom.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/main/plugins/org.talend.core/src/main/java/org/talend/designer/runprocess/ProcessorUtilities.java b/main/plugins/org.talend.core/src/main/java/org/talend/designer/runprocess/ProcessorUtilities.java index 3fa0dc10d0..c82fceee2d 100644 --- a/main/plugins/org.talend.core/src/main/java/org/talend/designer/runprocess/ProcessorUtilities.java +++ b/main/plugins/org.talend.core/src/main/java/org/talend/designer/runprocess/ProcessorUtilities.java @@ -1633,7 +1633,7 @@ public class ProcessorUtilities { } } - if (CommonsPlugin.isHeadless() && ("cTalendJob".equals(componentName) || "Routelets".equals(node.getComponent().getOriginalFamilyName())) && interpreter != null) { + if (isCIMode() && CommonsPlugin.isHeadless() && ("cTalendJob".equals(componentName) || "Routelets".equals(node.getComponent().getOriginalFamilyName())) && interpreter != null) { processItem.getProperty().setParentItem(ItemCacheManager.getProcessItem(currentProcess.getId(), currentProcess.getVersion())); } diff --git a/main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/tools/creator/AbstractMavenProcessorPom.java b/main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/tools/creator/AbstractMavenProcessorPom.java index 649c28bbc3..e08a07584d 100644 --- a/main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/tools/creator/AbstractMavenProcessorPom.java +++ b/main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/tools/creator/AbstractMavenProcessorPom.java @@ -165,7 +165,6 @@ public abstract class AbstractMavenProcessorPom extends CreateMavenBundleTemplat variablesValuesMap.put(ETalendMavenVariables.JobArtifactId, jobName); variablesValuesMap.put(ETalendMavenVariables.JobName, jobName); - variablesValuesMap.put(ETalendMavenVariables.JobVersion, PomIdsHelper.getJobVersion(property.getParentItem().getProperty())); } else { variablesValuesMap.put(ETalendMavenVariables.JobArtifactId, PomIdsHelper.getJobArtifactId(property)); final String jobName = JavaResourcesHelper.escapeFileName(process.getName());