Fixed dependency conflicts due to https://bugs.eclipse.org/bugs/show_…

…bug.cgi?id=477973 in fbmodel and infomodel pom.xml files
eclipse-vorto · Sep 25, 2016 · 6f8d645 · 6f8d645
1 parent c0514c7
commit 6f8d645
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 5 deletions.
diff --git a/bundles/org.eclipse.vorto.editor.functionblock/pom.xml b/bundles/org.eclipse.vorto.editor.functionblock/pom.xml
@@ -35,7 +35,6 @@
 				<configuration>
 					<includeProjectDependencies>false</includeProjectDependencies>
 					<includePluginDependencies>true</includePluginDependencies>
-					<cleanupDaemonThreads>false</cleanupDaemonThreads><!-- see https://bugs.eclipse.org/bugs/show_bug.cgi?id=475098#c3 -->
 					<mainClass>org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher</mainClass>
 					<arguments>
 						<argument>file://${project.basedir}/src/org/eclipse/vorto/editor/functionblock/GenerateFunctionblock.mwe2</argument>
@@ -48,16 +47,27 @@
 					</arguments>
 				</configuration>
 				<dependencies>
+					<dependency>
+						<groupId>org.eclipse.xtext</groupId>
+						<artifactId>org.eclipse.xtext.xtext</artifactId>
+						<version>${xtext.version}</version>
+						<exclusions>
+							<exclusion>
+								<groupId>org.eclipse.emf</groupId>
+								<artifactId>org.eclipse.emf.mwe2.runtime</artifactId>
+							</exclusion>
+						</exclusions>
+					</dependency>
 					<dependency>
 						<groupId>org.eclipse.emf</groupId>
 						<artifactId>org.eclipse.emf.mwe2.launch</artifactId>
 						<version>2.8.3</version>
 					</dependency>
 					<dependency>
-						<groupId>org.eclipse.xtext</groupId>
-						<artifactId>org.eclipse.xtext.xtext.generator</artifactId>
-						<version>${xtext.version}</version>
-					</dependency>
+						<groupId>org.eclipse.emf</groupId>
+						<artifactId>org.eclipse.emf.mwe2.runtime</artifactId>
+						<version>2.8.3</version>
+					</dependency>					
 					<dependency>
 						<groupId>org.eclipse.xtext</groupId>
 						<artifactId>org.eclipse.xtext.xbase</artifactId>
@@ -67,6 +77,12 @@
 						<groupId>org.eclipse.vorto</groupId>
 						<artifactId>org.eclipse.vorto.editor.datatype</artifactId>
 						<version>${project.version}</version>
+						<exclusions>
+							<exclusion>
+								<groupId>p2.eclipse-plugin</groupId>
+								<artifactId>*</artifactId>
+							</exclusion>
+						</exclusions>						
 					</dependency>
 					<dependency>
 						<groupId>org.eclipse.vorto</groupId>

diff --git a/bundles/org.eclipse.vorto.editor.infomodel/pom.xml b/bundles/org.eclipse.vorto.editor.infomodel/pom.xml
@@ -61,6 +61,12 @@
 						<groupId>org.eclipse.vorto</groupId>
 						<artifactId>org.eclipse.vorto.editor.datatype</artifactId>
 						<version>${project.version}</version>
+						<exclusions>
+							<exclusion>
+								<groupId>p2.eclipse-plugin</groupId>
+								<artifactId>*</artifactId>
+							</exclusion>
+						</exclusions>
 					</dependency>
 					<dependency>
 						<groupId>org.eclipse.vorto</groupId>