Merge remote-tracking branch 'origin/devel' into 563991-improve-checker-manager
diff --git a/org.polarsys.chess.parent/releng/org.polarsys.chess.configuration/pom.xml b/org.polarsys.chess.parent/releng/org.polarsys.chess.configuration/pom.xml
index 6cf6b8e..527e5fd 100644
--- a/org.polarsys.chess.parent/releng/org.polarsys.chess.configuration/pom.xml
+++ b/org.polarsys.chess.parent/releng/org.polarsys.chess.configuration/pom.xml
@@ -1,7 +1,7 @@
<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>
- <groupId>org.polarsys.chess</groupId>
+ <groupId>org.polarsys.chess</groupId>
<artifactId>org.polarsys.chess.configuration</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -11,13 +11,13 @@
</prerequisites>
<properties>
- <distribution.repository>file:///tmp/maven_repository/</distribution.repository>
+ <distribution.repository>file:///tmp/maven_repository/</distribution.repository>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-
+
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
-
+
<!-- Define overridable properties for tycho-surefire-plugin -->
<platformSystemProperties></platformSystemProperties>
<moduleProperties></moduleProperties>
@@ -28,26 +28,26 @@
<!-- Define a variable for the timestamp -->
<maven.build.timestamp.format>yyMMddHHmm</maven.build.timestamp.format>
<!-- <buildNumber>${maven.build.timestamp}</buildNumber> -->
- <chessBuildNumber>1.0.0</chessBuildNumber>
+ <!-- <chessBuildNumber>1.0.0</chessBuildNumber> -->
</properties>
-
+
<distributionManagement>
<repository>
- <id>CHESS</id>
- <name>CHESS</name>
- <url>${distribution.repository}</url>
- </repository>
- </distributionManagement>
-
- <repositories>
- <repository>
- <id>SDE</id>
- <url>http://es-static.fbk.eu/tools/maven_repository/SDE</url>
+ <id>CHESS</id>
+ <name>CHESS</name>
+ <url>${distribution.repository}</url>
</repository>
-
+ </distributionManagement>
+
+ <repositories>
<repository>
- <id>EST</id>
- <url>http://es-static.fbk.eu/tools/maven_repository/EST</url>
+ <id>SDE</id>
+ <url>http://es-static.fbk.eu/tools/maven_repository/SDE</url>
+ </repository>
+
+ <repository>
+ <id>EST</id>
+ <url>http://es-static.fbk.eu/tools/maven_repository/EST</url>
</repository>
</repositories>
@@ -283,6 +283,7 @@
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<emfRuntimeVersion>2.12</emfRuntimeVersion>
+ <chessBuildNumber>1.0.0</chessBuildNumber>
</properties>
<build>
<plugins>
@@ -351,6 +352,78 @@
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<emfRuntimeVersion>2.12</emfRuntimeVersion>
+ <chessBuildNumber>1.0.0</chessBuildNumber>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tycho.version}</version>
+ <configuration>
+ <target>
+ <artifact>
+ <groupId>org.polarsys.chess.target</groupId>
+ <artifactId>org.polarsys.chess.target.neon</artifactId>
+ <version>${project.version}</version>
+ </artifact>
+ </target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.xtend</groupId>
+ <artifactId>xtend-maven-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse.platform</groupId>
+ <artifactId>org.eclipse.equinox.common</artifactId>
+ <version>[3.8.0,4.0.0)</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>org.eclipse.jdt.core</artifactId>
+ <version>3.13.102</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>org.eclipse.jdt.compiler.apt</artifactId>
+ <version>1.3.110</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>org.eclipse.jdt.compiler.tool</artifactId>
+ <version>1.2.101</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.emf</groupId>
+ <artifactId>org.eclipse.emf.codegen</artifactId>
+ <version>2.11.0</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>Eclipse-Neon-Java8-devel</id>
+ <properties>
+ <!-- Tycho settings -->
+ <tycho.version>1.0.0</tycho.version>
+ <tycho.extras.version>1.0.0</tycho.extras.version>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
+ <xtextVersion>2.12.0</xtextVersion>
+ <ecore-xcore-version>1.3.1</ecore-xcore-version>
+ <ecore-xcore-codegen-version>1.2.0</ecore-xcore-codegen-version>
+ <ecore-xcore-lib-version>1.1.100</ecore-xcore-lib-version>
+ <mwe2Version>[2.9.0,2.9.1)</mwe2Version>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
+ <emfRuntimeVersion>2.12</emfRuntimeVersion>
+ <maven.build.timestamp.format>yyMMddHHmm</maven.build.timestamp.format>
+ <!-- <buildNumber>${maven.build.timestamp}</buildNumber> -->
+ <chessBuildNumber>devel_${maven.build.timestamp}</chessBuildNumber>
</properties>
<build>
<plugins>
diff --git a/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/src/org/polarsys/chess/contracts/verificationService/test/runtime/tests/TestBasicOperationsHeadless.java b/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/src/org/polarsys/chess/contracts/verificationService/test/runtime/tests/TestBasicOperationsHeadless.java
index 1d2e211..ce93bf5 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/src/org/polarsys/chess/contracts/verificationService/test/runtime/tests/TestBasicOperationsHeadless.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/src/org/polarsys/chess/contracts/verificationService/test/runtime/tests/TestBasicOperationsHeadless.java
@@ -60,7 +60,7 @@
@Test
@PluginResource(projectPath)
- @Ignore
+ //@Ignore
public void testExportModelAsOss() throws Exception {
Class umlSelectedComponent = getSystemComponent();
@@ -74,7 +74,7 @@
@Test
@PluginResource(emptyProjectPath)
- @Ignore
+ //@Ignore
public void testImportModelFromOssFile() throws Exception{
Model model = getModel();
@@ -135,7 +135,7 @@
@Test
@PluginResource(projectPath)
- @Ignore
+ //@Ignore
public void testExportStateMachinesAsSmv() throws Exception {
Model model = getModel();
