Fix dispose of the animation engine and the build
Change-Id: I471af3ee7181b9ca825279bbdfdfbccd62500ff0
Signed-off-by: jeremie.tatibouet <jeremie.tatibouet@cea.fr>
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/engine/rendering/AnimationEngine.java b/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/engine/rendering/AnimationEngine.java
index 7ffac10..37fed61 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/engine/rendering/AnimationEngine.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/engine/rendering/AnimationEngine.java
@@ -253,6 +253,7 @@
// The clean operation is in charge of:
// 1 - Releasing all model elements from their makers (if placed by the animation framework)
// 2 - Releasing all diagram referenced by the animation diagram manager
+ this.isReady = false;
this.deleteAllMarkers();
this.diagramManager.clean();
}
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/pom.xml b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/pom.xml
index 94a4258..f477a7d 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/pom.xml
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -15,41 +16,30 @@
<name>org.eclipse.papyrus.moka.fuml.libraries.tools.annotations</name>
<description>Annotations and annotation processor for creating new fUML libraries</description>
- <!-- Specific build sequence -->
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.xtend</groupId>
+ <artifactId>xtend-maven-plugin</artifactId>
+ <version>2.16.0</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>xtend-gen</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
<groupId>org.eclipse.xtend</groupId>
<artifactId>xtend-maven-plugin</artifactId>
- <executions>
- <execution>
- <phase>generate-sources</phase>
- <goals>
- <goal>compile</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <outputDirectory>xtend-gen</outputDirectory>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>xtend-gen</source>
- <source>src</source>
- </sources>
- </configuration>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
diff --git a/releng/org.eclipse.papyrus.moka.configuration/pom.xml b/releng/org.eclipse.papyrus.moka.configuration/pom.xml
index 2b0975d..41da667 100644
--- a/releng/org.eclipse.papyrus.moka.configuration/pom.xml
+++ b/releng/org.eclipse.papyrus.moka.configuration/pom.xml
@@ -1,16 +1,17 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
+
<modelVersion>4.0.0</modelVersion>
<!-- Moka depends on generic Papyrus component POM file -->
<parent>
<groupId>org.eclipse.papyrus.components</groupId>
<artifactId>org.eclipse.papyrus.components.parent</artifactId>
- <version>0.0.24</version>
+ <version>0.0.26</version>
<relativePath></relativePath>
</parent>
-
+
<!-- Moka root POM: general information -->
<groupId>org.eclipse.papyrus.moka</groupId>
<artifactId>org.eclipse.papyrus.moka.releng.configuration</artifactId>
@@ -22,8 +23,6 @@
<!-- Moka properties -->
<properties>
- <tycho-version>1.1.0</tycho-version>
- <tychoExtrasVersion>1.1.0</tychoExtrasVersion>
<component.shortname>moka</component.shortname>
<component.hudson.tabname>Moka</component.hudson.tabname>
<component.fullartifactId>org.eclipse.papyrus.moka</component.fullartifactId>
@@ -34,17 +33,17 @@
<target.version>4.0.0-SNAPSHOT</target.version>
</properties>
- <!-- Moka CI system-->
+ <!-- Moka CI system -->
<ciManagement>
<system>Hudson</system>
<url>https://hudson.eclipse.org/papyrus/view/${component.hudson.tabname}/</url>
</ciManagement>
-
+
<!-- Moka Bugzilla -->
<issueManagement>
<url>https://bugs.eclipse.org/bugs/buglist.cgi?product=Papyrus&component=${component.bugzilla.name}</url>
</issueManagement>
-
+
<!-- Moka Developpers -->
<developers>
<developer>
@@ -66,7 +65,7 @@
<id>jtatibouet</id>
</developer>
</developers>
-
+
<!-- Moka Contributors -->
<contributors>
<contributor>
@@ -86,7 +85,7 @@
<url>scm:git:https://git.eclipse.org/gitroot/www.eclipse.org/papyrus/components/${component.shortname}</url>
</site>
</distributionManagement>
-
+
<!-- Location to resolve Papyrus tools -->
<repositories>
@@ -129,6 +128,13 @@
<enabled>false</enabled>
</snapshots>
</pluginRepository>
-
+ <pluginRepository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Repository Group</name>
+ <url>http://repository.jboss.org/nexus/content/groups/public/</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository>
</pluginRepositories>
</project>
\ No newline at end of file
diff --git a/releng/platforms/org.eclipse.papyrus.moka.targetplatform.photon/org.eclipse.papyrus.moka.targetplatform.photon.target b/releng/platforms/org.eclipse.papyrus.moka.targetplatform.photon/org.eclipse.papyrus.moka.targetplatform.photon.target
index 1e0194e..191ea07 100644
--- a/releng/platforms/org.eclipse.papyrus.moka.targetplatform.photon/org.eclipse.papyrus.moka.targetplatform.photon.target
+++ b/releng/platforms/org.eclipse.papyrus.moka.targetplatform.photon/org.eclipse.papyrus.moka.targetplatform.photon.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
-<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Moka Photon Target Platform" sequenceNumber="1539165333">
+<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
+<target name="Moka Photon Target Platform" sequenceNumber="1547738508">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
@@ -9,7 +9,7 @@
<unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
<unit id="org.eclipse.equinox.p2.discovery.feature.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-09"/>
+ <repository id="eclipse" location="http://download.eclipse.org/releases/2018-12"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
@@ -32,7 +32,7 @@
<unit id="com.github.jnr.enxio" version="0.0.0"/>
<unit id="com.github.jnr.ffi" version="0.0.0"/>
<unit id="com.github.jnr.jffi" version="0.0.0"/>
- <repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/S20180820175350/repository"/>
+ <repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20181128170323/repository"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.nebula.widgets.xviewer.feature.feature.group" version="0.0.0"/>
diff --git a/releng/platforms/org.eclipse.papyrus.moka.targetplatform.photon/org.eclipse.papyrus.moka.targetplatform.photon.tpd b/releng/platforms/org.eclipse.papyrus.moka.targetplatform.photon/org.eclipse.papyrus.moka.targetplatform.photon.tpd
index 71b6005..ff62872 100644
--- a/releng/platforms/org.eclipse.papyrus.moka.targetplatform.photon/org.eclipse.papyrus.moka.targetplatform.photon.tpd
+++ b/releng/platforms/org.eclipse.papyrus.moka.targetplatform.photon/org.eclipse.papyrus.moka.targetplatform.photon.tpd
@@ -1,6 +1,6 @@
target "Moka Photon Target Platform" with source requirements
-location "http://download.eclipse.org/releases/2018-09" eclipse {
+location "http://download.eclipse.org/releases/2018-12" eclipse {
org.eclipse.platform.feature.group lazy
org.eclipse.rcp.feature.group lazy
org.eclipse.jdt.feature.group lazy
@@ -22,7 +22,7 @@
org.eclipse.equinox.weaving.sdk.feature.group lazy
}
-location "http://download.eclipse.org/tools/orbit/downloads/drops/S20180820175350/repository" orbit {
+location "http://download.eclipse.org/tools/orbit/downloads/drops/R20181128170323/repository" orbit {
com.fasterxml.jackson.core.jackson-annotations lazy
com.fasterxml.jackson.core.jackson-core lazy
com.github.jnr.constants lazy
diff --git a/tests/pom.xml b/tests/pom.xml
index 4a8c4ff..3743cae 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -18,9 +18,11 @@
<!-- Modules to build -->
<modules>
+ <!--
<module>semantics</module>
<module>fmi</module>
<module>org.eclipse.payrus.moka.tests.framework</module>
+ -->
</modules>
</project>
diff --git a/tests/semantics/org.eclipse.papyrus.moka.semantics.tests/META-INF/MANIFEST.MF b/tests/semantics/org.eclipse.papyrus.moka.semantics.tests/META-INF/MANIFEST.MF
index ab96abc..71ec652 100644
--- a/tests/semantics/org.eclipse.papyrus.moka.semantics.tests/META-INF/MANIFEST.MF
+++ b/tests/semantics/org.eclipse.papyrus.moka.semantics.tests/META-INF/MANIFEST.MF
@@ -19,7 +19,6 @@
org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.moka.composites.utils;bundle-version="4.0.0",
org.eclipse.papyrus.junit.utils;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.equinox.ds;bundle-version="[1.5.100,2.0.0)",
org.eclipse.equinox.event;bundle-version="[1.4.200,2.0.0)",
org.eclipse.uml2.uml.resources;bundle-version="[5.4.0,6.0.0)",
org.eclipse.papyrus.moka.fuml.standardlibrary;bundle-version="4.0.0",
