[releng]
- Switch to tycho 2.7.2 (accelerate build times)
- Fix configuration of C tests:
- use eclipse-test-plugin instead of eclipse-plugin in pom.xml
- add missing plugins in MANIFEST.MF
- add missing expectedResult in build.properties
Signed-off-by: Ansgar Radermacher <ansgar.radermacher@cea.fr>
Change-Id: Ibf0303ae78eab1cf1f18c42afd00864a4cd62a95
diff --git a/plugins/languages/c/org.eclipse.papyrus.designer.languages.c.tests/META-INF/MANIFEST.MF b/plugins/languages/c/org.eclipse.papyrus.designer.languages.c.tests/META-INF/MANIFEST.MF
index dcde8b7..70c7db1 100644
--- a/plugins/languages/c/org.eclipse.papyrus.designer.languages.c.tests/META-INF/MANIFEST.MF
+++ b/plugins/languages/c/org.eclipse.papyrus.designer.languages.c.tests/META-INF/MANIFEST.MF
@@ -4,6 +4,10 @@
org.junit,
org.eclipse.papyrus.designer.languages.c.codegen;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.designer.languages.c.codegen.ui;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.designer.languages.cpp.profile;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.designer.languages.common.profile;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.designer.languages.common.codegen.ui;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.designer.languages.cpp.library;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.uml.tools;bundle-version="[4.3.0,6.0.0)",
org.eclipse.papyrus.infra.core;bundle-version="[3.1.0,5.0.0)",
org.eclipse.papyrus.infra.ui;bundle-version="[2.1.0,4.0.0)",
@@ -19,7 +23,10 @@
org.eclipse.papyrus.junit.utils;bundle-version="1.1.0",
org.eclipse.papyrus.designer.languages.common.testutils;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.designer.languages.common.base,
- org.eclipse.uml2.uml;bundle-version="5.5.0"
+ org.eclipse.uml2.uml;bundle-version="5.5.0",
+ org.eclipse.uml2.uml.profile.standard;bundle-version="1.5.0",
+ org.eclipse.papyrus.uml.architecture;bundle-version="[1.0.0,3.0.0)",
+ org.eclipse.uml2.uml.resources;bundle-version="5.5.0"
Export-Package: org.eclipse.papyrus.designer.languages.c.codegen.tests
Bundle-Vendor: %providerName
Bundle-Version: 2.1.0.qualifier
diff --git a/plugins/languages/c/org.eclipse.papyrus.designer.languages.c.tests/build.properties b/plugins/languages/c/org.eclipse.papyrus.designer.languages.c.tests/build.properties
index 6c51042..96c7832 100644
--- a/plugins/languages/c/org.eclipse.papyrus.designer.languages.c.tests/build.properties
+++ b/plugins/languages/c/org.eclipse.papyrus.designer.languages.c.tests/build.properties
@@ -3,4 +3,5 @@
bin.includes = .,\
resources/,\
META-INF/,\
- plugin.properties
+ plugin.properties,\
+ expectedResult/
diff --git a/plugins/languages/c/org.eclipse.papyrus.designer.languages.c.tests/pom.xml b/plugins/languages/c/org.eclipse.papyrus.designer.languages.c.tests/pom.xml
index 49e4355..2b44df0 100644
--- a/plugins/languages/c/org.eclipse.papyrus.designer.languages.c.tests/pom.xml
+++ b/plugins/languages/c/org.eclipse.papyrus.designer.languages.c.tests/pom.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project>
+<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>
<parent>
<groupId>org.eclipse.papyrus.designer</groupId>
@@ -7,6 +8,6 @@
<version>2.1.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.designer.languages.c.codegen.tests</artifactId>
- <packaging>eclipse-plugin</packaging>
+ <packaging>eclipse-test-plugin</packaging>
<description>This module contains tests for the C code generator</description>
</project>
diff --git a/releng/org.eclipse.papyrus.designer.configuration/pom.xml b/releng/org.eclipse.papyrus.designer.configuration/pom.xml
index ec996a2..cc065a1 100644
--- a/releng/org.eclipse.papyrus.designer.configuration/pom.xml
+++ b/releng/org.eclipse.papyrus.designer.configuration/pom.xml
@@ -16,8 +16,8 @@
<component.rcp.name>org.eclipse.papyrus.designer.rcp</component.rcp.name>
<target.version>2.1.0-SNAPSHOT</target.version>
- <tycho.version>2.2.0</tycho.version>
- <tycho.extras.version>2.2.0</tycho.extras.version>
+ <tycho.version>2.7.2</tycho.version>
+ <tycho.extras.version>2.7.2</tycho.extras.version>
<xtend.version>2.21.0</xtend.version>
<!-- plugin versions -->
