TESB-32256: standard job fails to build after install accumulative patch TPS-4616

Merge branch 'maintenance/7.3' into vdrokov_fix_TESB-32256_maintenance/7.3
2021-03-11 13:49:01 +02:00 · 2021-03-11 11:38:43 +02:00 · 2021-03-01 19:03:38 +02:00
1 changed files with 6 additions and 1 deletions
--- 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
@@ -49,6 +49,7 @@ import org.talend.core.runtime.maven.MavenArtifact;
 import org.talend.core.runtime.maven.MavenConstants;
 import org.talend.core.runtime.maven.MavenUrlHelper;
 import org.talend.core.runtime.process.LastGenerationInfo;
+import org.talend.core.runtime.process.TalendProcessArgumentConstant;
 import org.talend.core.runtime.projectsetting.IProjectSettingTemplateConstants;
 import org.talend.core.runtime.repository.build.IMavenPomCreator;
 import org.talend.core.ui.ITestContainerProviderService;
@@ -149,7 +150,11 @@ public abstract class AbstractMavenProcessorPom extends CreateMavenBundleTemplat
            variablesValuesMap.put(ETalendMavenVariables.JobGroupId, PomIdsHelper.getJobGroupId(property));
            variablesValuesMap.put(ETalendMavenVariables.JobVersion, PomIdsHelper.getJobVersion(property));	    	
        }
-        variablesValuesMap.put(ETalendMavenVariables.JobArtifactId, PomIdsHelper.getJobArtifactId(property));	 
+        String artifactId = PomIdsHelper.getJobArtifactId(property);
+        if ("OSGI".equals(property.getAdditionalProperties().get(TalendProcessArgumentConstant.ARG_BUILD_TYPE))) {
+            artifactId = artifactId + "-bundle";
+        }
+        variablesValuesMap.put(ETalendMavenVariables.JobArtifactId, artifactId);
        variablesValuesMap.put(ETalendMavenVariables.TalendJobVersion, property.getVersion());
        final String jobName = JavaResourcesHelper.escapeFileName(process.getName());
        variablesValuesMap.put(ETalendMavenVariables.JobName, jobName);
Author	SHA1	Message	Date
vdrokov	24d49a4b20	TESB-32256: standard job fails to build after install accumulative patch TPS-4616	2021-03-11 13:49:01 +02:00
vdrokov	6b48b505a4	Merge branch 'maintenance/7.3' into vdrokov_fix_TESB-32256_maintenance/7.3	2021-03-11 11:38:43 +02:00
vdrokov	96e36601fb	TESB-32256: standard job fails to build after install accumulative patch TPS-4616	2021-03-01 19:03:38 +02:00