jprdonnelly/tcommon-studio-se
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(TESB-27578): fix feature.xml is missing in nexus (#3084)

Browse Source 
* fix(TESB-27578): fix feature.xml is missing in nexus

* fix(TESB-27578): fix for microservice sub job name changed
This commit is contained in:
Mike Yan
2020-02-14 14:50:39 +08:00
committed by GitHub
parent f53a15085c
commit 09a78b3956
2 changed files with 27 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/tools/creator/AbstractMavenProcessorPom.java
View File

@@ -301,9 +301,6 @@ public abstract class AbstractMavenProcessorPom extends CreateMavenBundleTemplat
property = jobInfo.getProcessItem().getProperty();
groupId = PomIdsHelper.getJobGroupId(property);
artifactId = PomIdsHelper.getJobArtifactId(jobInfo);
if ("OSGI".equals(property.getAdditionalProperties().get(TalendProcessArgumentConstant.ARG_BUILD_TYPE))) {
artifactId = artifactId + "-bundle";
}
version = PomIdsHelper.getJobVersion(property);
// try to get the pom version of children job and load from the pom file.

56
main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/tools/creator/CreateMavenStandardJobOSGiPom.java
View File

@@ -21,7 +21,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import org.apache.maven.model.Build;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Model;
import org.apache.maven.model.Plugin;
@@ -31,13 +30,15 @@ import org.codehaus.plexus.util.xml.Xpp3Dom;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.Platform;
import org.talend.commons.CommonsPlugin;
import org.talend.commons.exception.ExceptionHandler;
import org.talend.commons.exception.PersistenceException;
import org.talend.commons.utils.VersionUtils;
import org.talend.core.GlobalServiceRegister;
import org.talend.core.IESBService;
import org.talend.core.PluginChecker;
import org.talend.core.model.process.JobInfo;
import org.talend.core.model.properties.ProcessItem;
import org.talend.core.model.properties.Property;
import org.talend.core.model.relationship.Relation;
import org.talend.core.model.relationship.RelationshipItemBuilder;
@@ -118,37 +119,34 @@ public class CreateMavenStandardJobOSGiPom extends CreateMavenJobPom {
List<Profile> profiles = model.getProfiles();
for (Profile profile : profiles) {
if (profile.getId().equals("packaging-and-assembly")) {
List<Plugin> plugins = profile.getBuild().getPlugins();
for (Plugin plugin : plugins) {
if (plugin.getArtifactId().equals("maven-assembly-plugin")) {
PluginExecution pluginExecution = plugin.getExecutionsAsMap().get("default");
Xpp3Dom configuration = (Xpp3Dom) pluginExecution.getConfiguration();
Xpp3Dom archive = new Xpp3Dom("archive");
Xpp3Dom manifestFile = new Xpp3Dom("manifestFile");
manifestFile.setValue("${current.bundle.resources.dir}/META-INF/MANIFEST.MF");
archive.addChild(manifestFile);
configuration.addChild(archive);
}
}
}
// remove deploy plugin for service operation
if (isServiceOperation && profile.getId().equals("deploy-nexus")) {
model.removeProfile(profile);
break;
}
}
for (Profile profile : profiles) {
if ("deploy-nexus".equals(profile.getId())) {
if (isServiceOperation) {
// remove deploy-nexus plugin for service operation
model.removeProfile(profile);
} else {
List<Plugin> plugins = profile.getBuild().getPlugins();
for (Plugin plugin : plugins) {
if ("osgihelper-maven-plugin".equals(plugin.getArtifactId())) {
String talendVersion = VersionUtils.getTalendVersion();
String productVersion = VersionUtils.getInternalVersion();
if (productVersion.endsWith("-SNAPSHOT") || CommonsPlugin.isJUnitTest() //$NON-NLS-1$
|| Platform.inDevelopmentMode()) {
talendVersion += "-SNAPSHOT"; //$NON-NLS-1$
}
plugin.setVersion(talendVersion);
break;
}
}
}
break;
}
}
model.setName(model.getName() + " Bundle");
model.addProperty("talend.job.finalName", "${talend.job.name}-bundle-${project.version}");
if (isServiceOperation) {
model.setArtifactId(model.getArtifactId() + "-bundle");
model.addProperty("cloud.publisher.skip", "true");
model.setBuild(null);
} else {