Master 6.0 (#31)

* #23 Migrate to 2021-06 Tycho 2.0.0 => Tycho 2.2.0 Add explicit executionEnvironment Update deployment script Update TP to use 6.0.0 stable Change-Id: Iee1a271504e3f544fe1b7a2b66801e6ebb8d67ca * #25 Setup jarsigner and use version >= 1.3.0 Change-Id: Ia98c0fda232e0e791368afb96d93e71b92a16d4b * [releng] Bump to 6.0.0 Add sources to update sites Change-Id: I84a87485c324e8bcdd8596161a855649465fb38f * #23 Sirius 7.0.0 API changes impacts Change-Id: If45b3c9a7c2cb0a751467f9bacc1816410af33d9 * #23 Update EGF generated sources Rely on EGF 1.6.3 Change-Id: I0000000000000000000000000000000000000000 Signed-off-by: Arnaud Dieumegard <[email protected]> * #27 Update RotativeImage plugin uses Update code to use the enw version of Kitalpha's RotativeImage plugins Change-Id: I0000000000000000000000000000000000000000 Signed-off-by: Arnaud Dieumegard <[email protected]> * [releng] Update TP Change-Id: I0000000000000000000000000000000000000000 Signed-off-by: Arnaud Dieumegard <[email protected]> * #28 Infinite loop on documentation generation ObjectHelpers.getFileName(EObject) enters an infinite loop during documentation generation. Fixed by relying on a PlatformSwitch implementation returing calls to the correct getFileName implementations depending on the type of the element. Change-Id: I0000000000000000000000000000000000000000 Signed-off-by: Arnaud Dieumegard <[email protected]> * [releng] Update TP for removal of RuntimeCore Change-Id: I0000000000000000000000000000000000000000 Signed-off-by: Arnaud Dieumegard <[email protected]> * [releng] Update TP to latest Kitalpha Co-authored-by: Arnaud Dieumegard <[email protected]>
eclipse-kitalpha · Aug 5, 2022 · 7a5c70a · 7a5c70a
1 parent cab7d85
commit 7a5c70a
Show file tree

Hide file tree

Showing 97 changed files with 1,961 additions and 851 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -16,7 +16,7 @@ pipeline {
 				wrap([$class: 'Xvnc', takeScreenshot: false, useXauthority: true]) {
 					script {
 						def jacocoPrepareAgent = "-Djacoco.destFile=$JACOCO_EXEC_FILE_PATH -Djacoco.append=true org.jacoco:jacoco-maven-plugin:$JACOCO_VERSION:prepare-agent"
-						sh 'mvn  -Dmaven.test.failure.ignore=true ${jacocoPrepareAgent} clean verify -P introspector -e -f pom.xml'					    
+						sh 'mvn  -Dmaven.test.failure.ignore=true ${jacocoPrepareAgent} clean verify -P introspector -P sign -e -f pom.xml'					    
 					}					
 				}
 			}
@@ -32,16 +32,21 @@ pipeline {
 			}
 			steps {
 				sshagent ( ['projects-storage.eclipse.org-bot-ssh']) {
-					sh '''
-					echo "deploy update site"
-					DST_DIR=/home/data/httpd/download.eclipse.org/kitalpha/addons/introspector/nightly/master
-					ssh [email protected] rm -rf ${DST_DIR}
-					ssh [email protected] mkdir -p ${DST_DIR}
-					ssh [email protected] mkdir -p ${DST_DIR}/updates/
-					ssh [email protected] mkdir -p ${DST_DIR}/dropins/
-					scp -r releng/sites/introspector/org.polarsys.kitalpha.pdt.introspector.all.site/target/repository/* [email protected]:${DST_DIR}/updates/
-					scp -r releng/sites/introspector/org.polarsys.kitalpha.pdt.introspector.all.site/target/PDTTooling_All-dropins-*.zip [email protected]:${DST_DIR}/dropins/				
-					'''
+					script {
+					    def VERSION = BRANCH_NAME
+						if (VERSION.matches("v\\d\\.\\d\\.x")) {
+							VERSION = VERSION.substring(1)
+						}
+						sh "echo 'deploy update site'"
+						def DST_DIR='/home/data/httpd/download.eclipse.org/kitalpha/addons/introspector/nightly/'+VERSION
+
+						sh "ssh [email protected] rm -rf ${DST_DIR}"
+						sh "ssh [email protected] mkdir -p ${DST_DIR}"
+						sh "ssh [email protected] mkdir -p ${DST_DIR}/updates/"
+						sh "ssh [email protected] mkdir -p ${DST_DIR}/dropins/"
+						sh "scp -r releng/sites/introspector/org.polarsys.kitalpha.pdt.introspector.all.site/target/repository/* [email protected]:${DST_DIR}/updates/"
+						sh "scp -r releng/sites/introspector/org.polarsys.kitalpha.pdt.introspector.all.site/target/PDTTooling_All-dropins-*.zip [email protected]:${DST_DIR}/dropins/"
+					}
 				}
 			}
 		}

diff --git a/introspector/features/org.polarsys.kitalpha.pdt.docgen.feature/feature.xml b/introspector/features/org.polarsys.kitalpha.pdt.docgen.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.polarsys.kitalpha.pdt.docgen.feature"
       label="%featureName"
-      version="5.1.0.qualifier"
+      version="6.0.0.qualifier"
       provider-name="%providerName">
 
    <description>
@@ -18,7 +18,7 @@
    </license>
 
    <requires>
-      <import feature="org.polarsys.kitalpha.pdt.modeler.feature" version="5.1.0.qualifier"/>
+      <import feature="org.polarsys.kitalpha.pdt.modeler.feature" version="6.0.0.qualifier"/>
    </requires>
 
    <plugin

diff --git a/introspector/features/org.polarsys.kitalpha.pdt.docgen.ui.feature/feature.xml b/introspector/features/org.polarsys.kitalpha.pdt.docgen.ui.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.polarsys.kitalpha.pdt.docgen.ui.feature"
       label="%featureName"
-      version="5.1.0.qualifier"
+      version="6.0.0.qualifier"
       provider-name="%providerName">
 
    <description>
@@ -18,7 +18,7 @@
    </license>
 
    <requires>
-      <import feature="org.polarsys.kitalpha.pdt.docgen.feature" version="5.1.0.qualifier"/>
+      <import feature="org.polarsys.kitalpha.pdt.docgen.feature" version="6.0.0.qualifier"/>
    </requires>
 
    <plugin

diff --git a/introspector/features/org.polarsys.kitalpha.pdt.introspector.feature/feature.xml b/introspector/features/org.polarsys.kitalpha.pdt.introspector.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.polarsys.kitalpha.pdt.introspector.feature"
       label="%featureName"
-      version="5.1.0.qualifier"
+      version="6.0.0.qualifier"
       provider-name="%providerName">
 
    <description url="http://www.example.com/description">
@@ -18,7 +18,7 @@
    </license>
 
    <requires>
-      <import feature="org.polarsys.kitalpha.resourcereuse.emfscheme.feature" version="5.1.0.qualifier"/>
+      <import feature="org.polarsys.kitalpha.resourcereuse.emfscheme.feature" version="6.0.0.qualifier"/>
    </requires>
 
    <plugin

diff --git a/introspector/features/org.polarsys.kitalpha.pdt.introspector.ui.feature/feature.xml b/introspector/features/org.polarsys.kitalpha.pdt.introspector.ui.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.polarsys.kitalpha.pdt.introspector.ui.feature"
       label="%featureName"
-      version="5.1.0.qualifier"
+      version="6.0.0.qualifier"
       provider-name="%providerName">
 
    <description url="http://www.example.com/description">
@@ -18,7 +18,7 @@
    </license>
 
    <requires>
-      <import feature="org.polarsys.kitalpha.pdt.introspector.feature" version="5.1.0.qualifier"/>
+      <import feature="org.polarsys.kitalpha.pdt.introspector.feature" version="6.0.0.qualifier"/>
    </requires>
 
    <plugin

diff --git a/introspector/features/org.polarsys.kitalpha.pdt.metamodel.feature/feature.xml b/introspector/features/org.polarsys.kitalpha.pdt.metamodel.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.polarsys.kitalpha.pdt.metamodel.feature"
       label="%featureName"
-      version="5.1.0.qualifier"
+      version="6.0.0.qualifier"
       provider-name="%providerName">
 
    <description>

diff --git a/introspector/features/org.polarsys.kitalpha.pdt.modeler.feature/feature.xml b/introspector/features/org.polarsys.kitalpha.pdt.modeler.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.polarsys.kitalpha.pdt.modeler.feature"
       label="%featureName"
-      version="5.1.0.qualifier"
+      version="6.0.0.qualifier"
       provider-name="%providerName">
 
    <description>
@@ -18,7 +18,7 @@
    </license>
 
    <requires>
-      <import feature="org.polarsys.kitalpha.pdt.introspector.feature" version="5.1.0.qualifier"/>
+      <import feature="org.polarsys.kitalpha.pdt.introspector.feature" version="6.0.0.qualifier"/>
    </requires>
 
    <plugin

diff --git a/introspector/features/pom.xml b/introspector/features/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.polarsys</groupId>
 		<artifactId>org.polarsys.kitalpha.addons</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.0.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 </project>
diff --git a/introspector/plugins/org.polarsys.kitalpha.pdt.docgen.ui/META-INF/MANIFEST.MF b/introspector/plugins/org.polarsys.kitalpha.pdt.docgen.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.polarsys.kitalpha.pdt.docgen.ui;singleton:=true
-Bundle-Version: 5.1.0.qualifier
+Bundle-Version: 6.0.0.qualifier
 Bundle-Activator: org.polarsys.kitalpha.pdt.docgen.internal.ui.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.core.runtime,

diff --git a/introspector/plugins/org.polarsys.kitalpha.pdt.docgen.wizard/META-INF/MANIFEST.MF b/introspector/plugins/org.polarsys.kitalpha.pdt.docgen.wizard/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Gen Doc HTML wizard
 Bundle-SymbolicName: org.polarsys.kitalpha.pdt.docgen.wizard
-Bundle-Version: 5.1.0.qualifier
+Bundle-Version: 6.0.0.qualifier
 Bundle-Activator: org.polarsys.kitalpha.pdt.docgen.internal.wizard.Activator
 Bundle-Vendor: THALESGROUP
 Require-Bundle: org.eclipse.ui,

diff --git a/introspector/plugins/org.polarsys.kitalpha.pdt.docgen/META-INF/MANIFEST.MF b/introspector/plugins/org.polarsys.kitalpha.pdt.docgen/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.polarsys.kitalpha.pdt.docgen;singleton:=true
-Bundle-Version: 5.1.0.qualifier
+Bundle-Version: 6.0.0.qualifier
 Bundle-Activator: org.polarsys.kitalpha.pdt.internal.docgen.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.core.runtime,

diff --git a/...a.pdt.docgen/generated/org/polarsys/kitalpha/pdt/docgen/content/eclipseModelsContent.java b/...a.pdt.docgen/generated/org/polarsys/kitalpha/pdt/docgen/content/eclipseModelsContent.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.3.0.v20150924-1035
+//Generated with EGF 1.6.3.202110291409
 package org.polarsys.kitalpha.pdt.docgen.content;
 
 import java.util.*;
@@ -36,11 +36,7 @@ public static synchronized eclipseModelsContent create(String lineSeparator) {
 	protected final String TEXT_7 = "</h1>" + NL + "<hr style=\"width:98%; align : center; \" /> " + NL + "</div>" + NL
 			+ "" + NL + "<div style=\"position: absolute; top: 160px; left: 1%; z-index: 1; width: 98%;\">" + NL;
 	protected final String TEXT_8 = NL;
-	protected final String TEXT_9 = NL;
-	protected final String TEXT_10 = NL;
-	protected final String TEXT_11 = NL + NL + NL + NL;
-	protected final String TEXT_12 = NL;
-	protected final String TEXT_13 = NL;
+	protected final String TEXT_9 = NL + NL + NL + NL;
 
 	public eclipseModelsContent() {
 		//Here is the constructor
@@ -76,8 +72,8 @@ public String generate(Object argument) throws Exception {
 			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
 		}
 
-		stringBuffer.append(TEXT_12);
-		stringBuffer.append(TEXT_13);
+		stringBuffer.append(TEXT_8);
+		stringBuffer.append(TEXT_8);
 		return stringBuffer.toString();
 	}
 
@@ -171,10 +167,10 @@ protected void method_content(final StringBuffer stringBuffer, final PatternCont
 		String eclipseModelPage = org.polarsys.kitalpha.pdt.docgen.helpers.EclipseModelHelpers
 				.getEclipseModelPage((EclipseModel) element, projectName, outputFolder, 1);
 
-		stringBuffer.append(TEXT_9);
-		stringBuffer.append(TEXT_10);
+		stringBuffer.append(TEXT_8);
+		stringBuffer.append(TEXT_8);
 		stringBuffer.append(eclipseModelPage);
-		stringBuffer.append(TEXT_11);
+		stringBuffer.append(TEXT_9);
 		InternalPatternContext ictx = (InternalPatternContext) ctx;
 		new Node.DataLeaf(ictx.getNode(), getClass(), "content", stringBuffer.toString());
 	}

diff --git a/...pdt.docgen/generated/org/polarsys/kitalpha/pdt/docgen/content/extensionPointsContent.java b/...pdt.docgen/generated/org/polarsys/kitalpha/pdt/docgen/content/extensionPointsContent.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.6.2.202001031546
+//Generated with EGF 1.6.3.202110291409
 package org.polarsys.kitalpha.pdt.docgen.content;
 
 import org.polarsys.kitalpha.pdt.docgen.wizard.general.HTMLDocGenContext;

diff --git a/...lpha.pdt.docgen/generated/org/polarsys/kitalpha/pdt/docgen/content/extensionsContent.java b/...lpha.pdt.docgen/generated/org/polarsys/kitalpha/pdt/docgen/content/extensionsContent.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.6.2.202001031546
+//Generated with EGF 1.6.3.202110291409
 package org.polarsys.kitalpha.pdt.docgen.content;
 
 import org.polarsys.kitalpha.pdt.docgen.wizard.general.HTMLDocGenContext;

diff --git a/...italpha.pdt.docgen/generated/org/polarsys/kitalpha/pdt/docgen/content/featureContent.java b/...italpha.pdt.docgen/generated/org/polarsys/kitalpha/pdt/docgen/content/featureContent.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.3.0.v20150924-1035
+//Generated with EGF 1.6.3.202110291409
 package org.polarsys.kitalpha.pdt.docgen.content;
 
 import java.util.*;
@@ -36,19 +36,11 @@ public static synchronized featureContent create(String lineSeparator) {
 	protected final String TEXT_5 = NL + "<hr style=\"width:98%; align : center; \" /> " + NL + "</div>" + NL + "" + NL
 			+ "<div style=\"position: absolute; top: 160px; left: 1%; z-index: 1; width: 98%;\">" + NL;
 	protected final String TEXT_6 = NL;
-	protected final String TEXT_7 = NL;
-	protected final String TEXT_8 = NL;
-	protected final String TEXT_9 = NL + NL;
-	protected final String TEXT_10 = NL + "<h2>Representations</h2>";
-	protected final String TEXT_11 = NL;
-	protected final String TEXT_12 = NL + "<p><strong>";
-	protected final String TEXT_13 = "</strong></p>";
-	protected final String TEXT_14 = NL;
-	protected final String TEXT_15 = NL;
-	protected final String TEXT_16 = "</p>" + NL + NL;
-	protected final String TEXT_17 = NL;
-	protected final String TEXT_18 = NL;
-	protected final String TEXT_19 = NL;
+	protected final String TEXT_7 = NL + NL;
+	protected final String TEXT_8 = NL + "<h2>Representations</h2>";
+	protected final String TEXT_9 = NL + "<p><strong>";
+	protected final String TEXT_10 = "</strong></p>";
+	protected final String TEXT_11 = "</p>" + NL + NL;
 
 	public featureContent() {
 		//Here is the constructor
@@ -84,8 +76,8 @@ public String generate(Object argument) throws Exception {
 			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
 		}
 
-		stringBuffer.append(TEXT_18);
-		stringBuffer.append(TEXT_19);
+		stringBuffer.append(TEXT_6);
+		stringBuffer.append(TEXT_6);
 		return stringBuffer.toString();
 	}
 
@@ -182,29 +174,29 @@ protected void method_content(final StringBuffer stringBuffer, final PatternCont
 		String featurePage = org.polarsys.kitalpha.pdt.docgen.helpers.FeatureHelpers.getFeaturePage((Feature) element,
 				projectName, outputFolder, 1);
 
-		stringBuffer.append(TEXT_7);
+		stringBuffer.append(TEXT_6);
 		stringBuffer.append(featurePage);
-		stringBuffer.append(TEXT_8);
+		stringBuffer.append(TEXT_6);
 
 		if (diagramsInclusion) {
 			diagramList = org.polarsys.kitalpha.pdt.docgen.services.GenerateDiagramsService
 					.generateDiagramsForTheGivenObject((Feature) element);
 		}
 
-		stringBuffer.append(TEXT_9);
+		stringBuffer.append(TEXT_7);
 
 		if (diagramList.size() >= 1) {
-			stringBuffer.append(TEXT_10);
+			stringBuffer.append(TEXT_8);
 		}
-		stringBuffer.append(TEXT_11);
+		stringBuffer.append(TEXT_6);
 		for (DRepresentation diagram : diagramList) {
 			if (diagram instanceof DSemanticDiagram
 					&& ((DSemanticDiagram) diagram).getDescription().getName().equals("Features and Plugins")) {
 				String generatedFolder = fileNameService.getFileName(((DSemanticDiagram) diagram).getTarget());
-				stringBuffer.append(TEXT_12);
+				stringBuffer.append(TEXT_9);
 				stringBuffer.append(((DSemanticDiagram) diagram).getDescription().getName());
-				stringBuffer.append(TEXT_13);
-				stringBuffer.append(TEXT_14);
+				stringBuffer.append(TEXT_10);
+				stringBuffer.append(TEXT_6);
 				{
 					//<%@ egf:patternCall patternId="platform:/plugin/org.polarsys.kitalpha.doc.gen.business.core/egf/HTMLDocGenCommon.fcore#LogicalName=org.polarsys.kitalpha.doc.gen.business.core.sirius.DiagramGenerator" args="diagram:diagram, outputFolder:outputFolder, projectName:projectName, generatedFolder:generatedFolder, fileNameService:fileNameService, helper:helper"%>
 
@@ -227,16 +219,16 @@ protected void method_content(final StringBuffer stringBuffer, final PatternCont
 
 			}
 		}
-		stringBuffer.append(TEXT_15);
+		stringBuffer.append(TEXT_6);
 
-		stringBuffer.append(TEXT_16);
+		stringBuffer.append(TEXT_11);
 
 		if (diagramsInclusion) {
 			AIRDHelpers.INSTANCE.clearCurrentAird();
 			AIRDHelpers.INSTANCE.cleanAllMaps();
 		}
 
-		stringBuffer.append(TEXT_17);
+		stringBuffer.append(TEXT_6);
 		InternalPatternContext ictx = (InternalPatternContext) ctx;
 		new Node.DataLeaf(ictx.getNode(), getClass(), "content", stringBuffer.toString());
 	}

diff --git a/...talpha.pdt.docgen/generated/org/polarsys/kitalpha/pdt/docgen/content/packagesContent.java b/...talpha.pdt.docgen/generated/org/polarsys/kitalpha/pdt/docgen/content/packagesContent.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.3.0.v20150924-1035
+//Generated with EGF 1.6.3.202110291409
 package org.polarsys.kitalpha.pdt.docgen.content;
 
 import java.util.*;
@@ -36,11 +36,7 @@ public static synchronized packagesContent create(String lineSeparator) {
 	protected final String TEXT_7 = "</h1>" + NL + "<hr style=\"width:98%; align : center; \" /> " + NL + "</div>" + NL
 			+ "" + NL + "<div style=\"position: absolute; top: 160px; left: 1%; z-index: 1; width: 98%;\">" + NL;
 	protected final String TEXT_8 = NL;
-	protected final String TEXT_9 = NL;
-	protected final String TEXT_10 = NL;
-	protected final String TEXT_11 = NL + NL + NL + NL;
-	protected final String TEXT_12 = NL;
-	protected final String TEXT_13 = NL;
+	protected final String TEXT_9 = NL + NL + NL + NL;
 
 	public packagesContent() {
 		//Here is the constructor
@@ -76,8 +72,8 @@ public String generate(Object argument) throws Exception {
 			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);
 		}
 
-		stringBuffer.append(TEXT_12);
-		stringBuffer.append(TEXT_13);
+		stringBuffer.append(TEXT_8);
+		stringBuffer.append(TEXT_8);
 		return stringBuffer.toString();
 	}
 
@@ -171,10 +167,10 @@ protected void method_content(final StringBuffer stringBuffer, final PatternCont
 		String packagePage = org.polarsys.kitalpha.pdt.docgen.helpers.PackagesHelpers.getPackagePage((Package) element,
 				projectName, outputFolder, 1);
 
-		stringBuffer.append(TEXT_9);
-		stringBuffer.append(TEXT_10);
+		stringBuffer.append(TEXT_8);
+		stringBuffer.append(TEXT_8);
 		stringBuffer.append(packagePage);
-		stringBuffer.append(TEXT_11);
+		stringBuffer.append(TEXT_9);
 		InternalPatternContext ictx = (InternalPatternContext) ctx;
 		new Node.DataLeaf(ictx.getNode(), getClass(), "content", stringBuffer.toString());
 	}

diff --git a/...kitalpha.pdt.docgen/generated/org/polarsys/kitalpha/pdt/docgen/content/pluginContent.java b/...kitalpha.pdt.docgen/generated/org/polarsys/kitalpha/pdt/docgen/content/pluginContent.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.6.1.201906060805
+//Generated with EGF 1.6.3.202110291409
 package org.polarsys.kitalpha.pdt.docgen.content;
 
 import org.eclipse.sirius.viewpoint.DRepresentationDescriptor;