catch up with branch daily
Signed-off-by: Ralf Mollik <ramollik@compex-commerce.com>
diff --git a/org.eclipse.osbp.releng.maven.parent.tycho/pom.xml b/org.eclipse.osbp.releng.maven.parent.tycho/pom.xml
index 67df93a..228dcac 100644
--- a/org.eclipse.osbp.releng.maven.parent.tycho/pom.xml
+++ b/org.eclipse.osbp.releng.maven.parent.tycho/pom.xml
@@ -1782,6 +1782,21 @@
<artifactId>org.eclipse.equinox.common</artifactId>
<version>3.10.0</version>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>org.eclipse.jdt.core</artifactId>
+ <version>3.12.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>org.eclipse.jdt.debug</artifactId>
+ <version>3.12.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>org.eclipse.jdt.launching</artifactId>
+ <version>3.11.0</version>
+ </dependency>
</dependencies>
<executions>
<execution>
@@ -1790,7 +1805,9 @@
<goal>testCompile</goal>
</goals>
<configuration>
- <outputDirectory>xtend-gen</outputDirectory>
+ <javaSourceVersion>1.7</javaSourceVersion>
+ <writeTraceFiles>false</writeTraceFiles>
+ <outputDirectory>xtend-gen</outputDirectory>
</configuration>
</execution>
</executions>
@@ -1893,6 +1910,21 @@
<artifactId>org.eclipse.equinox.common</artifactId>
<version>3.10.0</version>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>org.eclipse.jdt.core</artifactId>
+ <version>3.12.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>org.eclipse.jdt.debug</artifactId>
+ <version>3.12.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>org.eclipse.jdt.launching</artifactId>
+ <version>3.11.0</version>
+ </dependency>
</dependencies>
<executions>
<execution>
@@ -1904,9 +1936,11 @@
</goals>
</execution>
</executions>
- <configuration>
- <outputDirectory>xtend-gen</outputDirectory>
- </configuration>
+ <configuration>
+ <javaSourceVersion>1.7</javaSourceVersion>
+ <writeTraceFiles>false</writeTraceFiles>
+ <outputDirectory>xtend-gen</outputDirectory>
+ </configuration>
</plugin>
<plugin>
<groupId>pl.project13.maven</groupId>
diff --git a/pom.xml b/pom.xml
index f95f9ce..d8f19af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -155,6 +155,8 @@
<tychoExtrasVersion>0.26.0</tychoExtrasVersion>
<xtext.version>2.11.0</xtext.version>
+ <sirius.version>4.1.3</sirius.version>
+ <sirius.repo.url>http://download.eclipse.org/sirius/updates/releases/${sirius.version}/${osbp.build.eclipse.platform.name}/</sirius.repo.url>
<osbp.skip.javadoc>false</osbp.skip.javadoc>
<osbp.javadoc.linksource>false</osbp.javadoc.linksource>
@@ -1735,6 +1737,21 @@
<artifactId>org.eclipse.equinox.common</artifactId>
<version>3.10.0</version>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>org.eclipse.jdt.core</artifactId>
+ <version>3.12.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>org.eclipse.jdt.debug</artifactId>
+ <version>3.12.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>org.eclipse.jdt.launching</artifactId>
+ <version>3.11.0</version>
+ </dependency>
</dependencies>
</plugin>
<plugin>