Compare commits

...

1 Commits

Author SHA1 Message Date
apoltavtsev
de61b58787 fix(TESB-31274) jobs containing tRestClient build issues 2020-12-16 08:16:55 +01:00

View File

@@ -662,7 +662,7 @@ public class CreateMavenJobPom extends AbstractMavenProcessorPom {
Set<JobInfo> childrenJobInfo = processor.getBuildChildrenJobs().stream().filter(j -> !j.isTestContainer())
.collect(Collectors.toSet());
if (!hasLoopDependency()) {
childrenJobInfo.forEach(j -> jobCoordinate.add(getJobCoordinate(j.getProcessItem().getProperty())));
childrenJobInfo.forEach(j -> jobCoordinate.add(getChildrenJobCoordinate(j.getProcessItem().getProperty())));
}
// talend libraries and codes
@@ -823,6 +823,13 @@ public class CreateMavenJobPom extends AbstractMavenProcessorPom {
return getCoordinate(PomIdsHelper.getJobGroupId(property), PomIdsHelper.getJobArtifactId(property),
MavenConstants.PACKAGING_JAR, PomIdsHelper.getJobVersion(property), null);
}
protected String getChildrenJobCoordinate(Property property) {
return getCoordinate(PomIdsHelper.getJobGroupId(property),
"OSGI".equals(property.getAdditionalProperties().get(TalendProcessArgumentConstant.ARG_BUILD_TYPE))?
PomIdsHelper.getJobArtifactId(property) + "-bundle" : PomIdsHelper.getJobArtifactId(property),
MavenConstants.PACKAGING_JAR, PomIdsHelper.getJobVersion(property), null);
}
protected String getCoordinate(String groupId, String artifactId, String type, String version, String classifier) {
String separator = ":"; //$NON-NLS-1$