[releng] add support for jacoco & adaptations for sirius

Change-Id: I1d50e9971eeb41b3020fe7f2a0d55b3040c0c397

7 files changed, 21 insertions, 25 deletions

diff --git a/pom.xml b/pom.xml
index 1976ed3ad..36b90036e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,16 +45,11 @@
 		<maven.compiler.target>1.8</maven.compiler.target>
 
 
-		<coverage.skip>false</coverage.skip>
-		<coverage.destFile>./target/jacoco.exec</coverage.destFile>
-		
-		<sonar.java.source>8</sonar.java.source>
-		<sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
-		<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
-		<sonar.jacoco.release>0.8.3</sonar.jacoco.release>
-		<sonar.jacoco.reportPath>${coverage.destFile}</sonar.jacoco.reportPath>
-	  	<sonar.exclusions>**/generated/**/*.java,**/src-gen/**/*.java</sonar.exclusions>
-	  	<sonar.test.exclusions>**/tests/**/*.java,**/test/**/*.java</sonar.test.exclusions>
+		<jacoco.coverage.skip>false</jacoco.coverage.skip>
+		<jacoco.release>0.8.3</jacoco.release>
+		<jacoco.reportPath>./target/jacoco.exec</jacoco.reportPath>
+		<jacoco.includes>org.eclipse.egf.*</jacoco.includes>
+		<jacoco.excludes>org.eclipse.egf.emf.*</jacoco.excludes>
 
 		<os>linux</os>
 		<ws>gtk</ws>
@@ -425,16 +420,18 @@
 			<plugin>
 				<groupId>org.jacoco</groupId>
 				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>${sonar.jacoco.release}</version>
+				<version>${jacoco.release}</version>
 				<executions>
 					<execution>
 						<goals>
 							<goal>prepare-agent</goal>
 						</goals>
 						<configuration>
-							<skip>${coverage.skip}</skip>
-							<destFile>${sonar.jacoco.reportPath}</destFile>
+							<skip>${jacoco.coverage.skip}</skip>
+							<destFile>${jacoco.reportPath}</destFile>
 							<propertyName>failsafeArgline</propertyName>
+							<includes>${jacoco.includes}</includes>
+							<excludes>${jacoco.excludes}</excludes>
 						</configuration>
 					</execution>
 				</executions>
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/command/CreateEdgeCommand.java b/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/command/CreateEdgeCommand.java
index 028aed1fd..d1141c9d4 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/command/CreateEdgeCommand.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/command/CreateEdgeCommand.java
@@ -38,10 +38,10 @@ import org.eclipse.sirius.diagram.EdgeTarget;
 import org.eclipse.sirius.diagram.business.api.componentization.DiagramMappingsManager;
 import org.eclipse.sirius.diagram.business.api.query.EdgeMappingQuery;
 import org.eclipse.sirius.diagram.business.internal.componentization.mappings.DiagramMappingsManagerRegistryImpl;
-import org.eclipse.sirius.diagram.business.internal.experimental.sync.DDiagramElementSynchronizer;
-import org.eclipse.sirius.diagram.business.internal.experimental.sync.DDiagramSynchronizer;
-import org.eclipse.sirius.diagram.business.internal.experimental.sync.DEdgeCandidate;
 import org.eclipse.sirius.diagram.business.internal.metamodel.operations.DDiagramSpecOperations;
+import org.eclipse.sirius.diagram.business.internal.sync.DDiagramElementSynchronizer;
+import org.eclipse.sirius.diagram.business.internal.sync.DDiagramSynchronizer;
+import org.eclipse.sirius.diagram.business.internal.sync.DEdgeCandidate;
 import org.eclipse.sirius.diagram.description.ContainerMapping;
 import org.eclipse.sirius.diagram.description.DiagramElementMapping;
 import org.eclipse.sirius.diagram.description.EdgeMapping;
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/command/CreateNodeCommand.java b/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/command/CreateNodeCommand.java
index f3c1647bd..954094827 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/command/CreateNodeCommand.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/command/CreateNodeCommand.java
@@ -36,10 +36,10 @@ import org.eclipse.sirius.diagram.DragAndDropTarget;
 import org.eclipse.sirius.diagram.business.api.componentization.DiagramMappingsManager;
 import org.eclipse.sirius.diagram.business.api.query.AbstractNodeMappingQuery;
 import org.eclipse.sirius.diagram.business.internal.componentization.mappings.DiagramMappingsManagerRegistryImpl;
-import org.eclipse.sirius.diagram.business.internal.experimental.sync.AbstractDNodeCandidate;
-import org.eclipse.sirius.diagram.business.internal.experimental.sync.DDiagramSynchronizer;
 import org.eclipse.sirius.diagram.business.internal.metamodel.helper.ContainerMappingHelper;
 import org.eclipse.sirius.diagram.business.internal.metamodel.helper.MappingHelper;
+import org.eclipse.sirius.diagram.business.internal.sync.DDiagramSynchronizer;
+import org.eclipse.sirius.diagram.business.internal.sync.DNodeCandidate;
 import org.eclipse.sirius.diagram.description.AbstractNodeMapping;
 import org.eclipse.sirius.diagram.description.ContainerMapping;
 import org.eclipse.sirius.diagram.description.DiagramElementMapping;
@@ -159,7 +159,7 @@ public class CreateNodeCommand extends RecordingCommand {
 	 */
 	private AbstractDNode createOneNode(EObject target, AbstractNodeMapping mapping, DragAndDropTarget parent){
 		RefreshIdsHolder refreshIdsHolder = new RefreshIdsHolder();
-		final AbstractDNodeCandidate abstractDNodeCandidate = new AbstractDNodeCandidate(mapping, target, parent, refreshIdsHolder); 
+		final DNodeCandidate abstractDNodeCandidate = new DNodeCandidate(mapping, target, parent, refreshIdsHolder); 
 		return diagramSynchronizer.getElementSynchronizer().createNewNode(diagramMappingsManager, abstractDNodeCandidate, false);
 	}
 
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/operation/CreateEcoreTools2RepresentationOperation.java b/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/operation/CreateEcoreTools2RepresentationOperation.java
index 4555cf1d2..2fb2d9d67 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/operation/CreateEcoreTools2RepresentationOperation.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/operation/CreateEcoreTools2RepresentationOperation.java
@@ -69,12 +69,12 @@ import org.eclipse.sirius.diagram.business.api.refresh.CanonicalSynchronizer;
 import org.eclipse.sirius.diagram.business.api.refresh.CanonicalSynchronizerFactory;
 import org.eclipse.sirius.diagram.business.api.refresh.DiagramCreationUtil;
 import org.eclipse.sirius.diagram.business.internal.metamodel.helper.ContentHelper;
+import org.eclipse.sirius.diagram.business.internal.refresh.SynchronizeGMFModelCommand;
 import org.eclipse.sirius.diagram.description.AbstractNodeMapping;
 import org.eclipse.sirius.diagram.description.ContainerMapping;
 import org.eclipse.sirius.diagram.description.DiagramDescription;
 import org.eclipse.sirius.diagram.description.EdgeMapping;
 import org.eclipse.sirius.diagram.description.NodeMapping;
-import org.eclipse.sirius.diagram.ui.internal.refresh.SynchronizeGMFModelCommand;
 import org.eclipse.sirius.ecore.extender.business.api.accessor.ModelAccessor;
 import org.eclipse.sirius.ext.base.Option;
 import org.eclipse.sirius.table.metamodel.table.DTable;
diff --git a/releng/org.eclipse.egf.targets/core-2019-03.target b/releng/org.eclipse.egf.targets/core-2019-03.target
index 9e1d81aea..de4995ba5 100644
--- a/releng/org.eclipse.egf.targets/core-2019-03.target
+++ b/releng/org.eclipse.egf.targets/core-2019-03.target
@@ -29,7 +29,7 @@
       <unit id="org.eclipse.m2m.atl.feature.group" version="0.0.0"/>

       <unit id="org.eclipse.uml2.uml.feature.group" version="0.0.0"/>

       <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>

-      <repository id="eclipse" location="http://download.eclipse.org/releases/2018-12/"/>

+      <repository id="eclipse" location="https://download.eclipse.org/releases/2019-03/"/>

     </location>

     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">

       <unit id="org.eclipse.acceleo.sdk.feature.group" version="0.0.0"/>

@@ -58,7 +58,7 @@
       <unit id="org.eclipse.sirius.runtime.acceleo.source.feature.group" version="0.0.0"/>

       <unit id="org.eclipse.sirius.runtime.aql.feature.group" version="0.0.0"/>

       <unit id="org.eclipse.sirius.runtime.aql.source.feature.group" version="0.0.0"/>

-      <repository id="Sirus" location="https://download.eclipse.org/sirius/updates/nightly/6.2.0-N20190129-113513/2018-12/"/>

+      <repository id="Sirus" location="https://download.eclipse.org/sirius/updates/nightly/6.2.x/2018-12/"/>

     </location>

     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">

       <unit id="org.eclipse.emf.ecoretools.sdk.feature.group" version="0.0.0"/>

diff --git a/releng/org.eclipse.egf.targets/core-2019-03.targetplatform b/releng/org.eclipse.egf.targets/core-2019-03.targetplatform
index 27e0981d8..21812874b 100644
--- a/releng/org.eclipse.egf.targets/core-2019-03.targetplatform
+++ b/releng/org.eclipse.egf.targets/core-2019-03.targetplatform
@@ -1,6 +1,6 @@
 target "core"  with source, requirements

 

-location eclipse "http://download.eclipse.org/releases/2018-12/" {

+location eclipse "https://download.eclipse.org/releases/2019-03/" {

 	org.eclipse.sdk.feature.group lazy

 	org.eclipse.emf.sdk.feature.group lazy

 	org.eclipse.emf.common.feature.group lazy

@@ -33,7 +33,7 @@ location acceleo "http://download.eclipse.org/acceleo/updates/releases/3.7/R2017
 	org.eclipse.acceleo.sdk.feature.group lazy

 }

 

-location Sirus "https://download.eclipse.org/sirius/updates/nightly/6.2.0-N20190129-113513/2018-12/" {

+location Sirus "https://download.eclipse.org/sirius/updates/nightly/6.2.x/2018-12/" {

 	org.eclipse.sirius.doc.feature.feature.group lazy

 	org.eclipse.sirius.runtime.ide.eef.feature.group lazy

 	org.eclipse.sirius.runtime.ide.ui.acceleo.feature.group lazy

diff --git a/tests/org.eclipse.emf.egf.core.test.rcptt/all.suite b/tests/org.eclipse.emf.egf.core.test.rcptt/all.suite
index 41a1d39d7..ea97a32c7 100644
--- a/tests/org.eclipse.emf.egf.core.test.rcptt/all.suite
+++ b/tests/org.eclipse.emf.egf.core.test.rcptt/all.suite
@@ -13,7 +13,6 @@ Entry-Name: testcase-items
 
 _ExirQIyNEeaLRPgUbfwOUw	// kind: 'test' name: 'FcoreEditor__0001' path: 'FcoreEditor/FcoreEditor__0001.test'
 _xI5LgLYfEea1os7Kor2vgw	// kind: 'test' name: 'FcoreEditor__0002' path: 'FcoreEditor/FcoreEditor__0002.test'
-_UCVdkPniEeap6-UVHA_DIA	// kind: 'test' name: 'genchain_0001' path: 'genchain/genchain_0001.test'
 _676vULYgEea1os7Kor2vgw	// kind: 'test' name: 'WorkbenchActions__0001' path: 'WorkbenchActions/WorkbenchActions__0001.test'
 
 ------=_testcase-items-62c497da-4241-31f4-811a-6b453a3ecff8--