diff --git a/main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/tools/AggregatorPomsHelper.java b/main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/tools/AggregatorPomsHelper.java index e853047075..d0fa61addf 100644 --- a/main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/tools/AggregatorPomsHelper.java +++ b/main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/tools/AggregatorPomsHelper.java @@ -891,16 +891,31 @@ public class AggregatorPomsHelper { } else { model.getModules().addAll(collectRefProjectModules(null)); } + boolean isCIMode = false; + if (IRunProcessService.get() != null) { + isCIMode = IRunProcessService.get().isCIMode(); + } + createRootPom(model, true, monitor); installRootPom(true); monitor.worked(1); if (monitor.isCanceled()) { return; } + // codes pom monitor.subTask("Synchronize code poms"); //$NON-NLS-1$ - updateCodeProjects(monitor, true, true); + + if (isCIMode) { + System.setProperty("ignore.ci.mode", Boolean.TRUE.toString()); + updateCodeProjects(monitor, true, true); + System.setProperty("ignore.ci.mode", Boolean.FALSE.toString()); + } else { + updateCodeProjects(monitor, true, true); + } + CodesJarM2CacheManager.updateCodesJarProject(monitor, true, true, true); + monitor.worked(1); if (monitor.isCanceled()) { return; @@ -956,6 +971,15 @@ public class AggregatorPomsHelper { if (monitor.isCanceled()) { return; } + if (isCIMode) { + for (ERepositoryObjectType codeType : ERepositoryObjectType.getAllTypesOfCodes()) { + ITalendProcessJavaProject codeProject = getCodesProject(codeType); + if (codeProject != null) { + updateCodeProjectPom(monitor, codeType, codeProject.getProjectPom()); + } + } + } + monitor.done(); } diff --git a/main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/tools/creator/AbstractMavenCodesTemplatePom.java b/main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/tools/creator/AbstractMavenCodesTemplatePom.java index 0734a705de..ac1c5c9536 100644 --- a/main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/tools/creator/AbstractMavenCodesTemplatePom.java +++ b/main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/tools/creator/AbstractMavenCodesTemplatePom.java @@ -102,7 +102,11 @@ public abstract class AbstractMavenCodesTemplatePom extends AbstractMavenGeneral existedDependencies = new ArrayList(); model.setDependencies(existedDependencies); } - + boolean isCIMode = false; + if (IRunProcessService.get() != null) { + isCIMode = IRunProcessService.get().isCIMode(); + } + boolean ignoreCIMode = Boolean.getBoolean("ignore.ci.mode"); for (ModuleNeeded module : needModules) { Dependency dependency = null; // TDI-37032 add dependency only if jar available in maven @@ -117,11 +121,8 @@ public abstract class AbstractMavenCodesTemplatePom extends AbstractMavenGeneral } else { isDeployed = true; } - boolean isCIMode = false; - if (GlobalServiceRegister.getDefault().isServiceRegistered(IRunProcessService.class)) { - IRunProcessService runProcessService = GlobalServiceRegister.getDefault() - .getService(IRunProcessService.class); - isCIMode = runProcessService.isCIMode(); + if (!isDeployed && ignoreCIMode) { + continue; } if (isCIMode || ignoreModuleInstallationStatus() || isDeployed) { dependency = PomUtil.createModuleDependency(module.getMavenUri());