Merge "Replace extra classpath elements on extra requirements in pom.xml Workaround for bug 518354"
diff --git a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.recording.swt.rap/pom.xml b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.recording.swt.rap/pom.xml
index 346108d..23d1836 100644
--- a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.recording.swt.rap/pom.xml
+++ b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.recording.swt.rap/pom.xml
@@ -34,15 +34,6 @@
<plugin>
<groupId>${tycho-groupid}</groupId>
<artifactId>tycho-compiler-plugin</artifactId>
- <configuration>
- <extraClasspathElements>
- <extraClasspathElement>
- <groupId>org.eclipse.rcptt.tesla</groupId>
- <artifactId>org.eclipse.rcptt.tesla.swt.fragment.rap</artifactId>
- <version>2.5.0-SNAPSHOT</version>
- </extraClasspathElement>
- </extraClasspathElements>
- </configuration>
<dependencies>
<dependency>
<groupId>org.eclipse.rcptt.tesla</groupId>
@@ -51,6 +42,21 @@
</dependency>
</dependencies>
</plugin>
+ <plugin>
+ <groupId>${tycho-groupid}</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <configuration>
+ <dependency-resolution>
+ <extraRequirements>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.eclipse.rcptt.tesla.swt.fragment.rap</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ </extraRequirements>
+ </dependency-resolution>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
diff --git a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.swt.rap/pom.xml b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.swt.rap/pom.xml
index 594a8ba..79c8bb2 100644
--- a/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.swt.rap/pom.xml
+++ b/modules/rap/bundles/runtime/tesla/org.eclipse.rcptt.tesla.swt.rap/pom.xml
@@ -34,15 +34,6 @@
<plugin>
<groupId>${tycho-groupid}</groupId>
<artifactId>tycho-compiler-plugin</artifactId>
- <configuration>
- <extraClasspathElements>
- <extraClasspathElement>
- <groupId>org.eclipse.rcptt.tesla</groupId>
- <artifactId>org.eclipse.rcptt.tesla.swt.fragment.rap</artifactId>
- <version>2.5.0-SNAPSHOT</version>
- </extraClasspathElement>
- </extraClasspathElements>
- </configuration>
<dependencies>
<dependency>
<groupId>org.eclipse.rcptt.tesla</groupId>
@@ -51,6 +42,21 @@
</dependency>
</dependencies>
</plugin>
+ <plugin>
+ <groupId>${tycho-groupid}</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <configuration>
+ <dependency-resolution>
+ <extraRequirements>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.eclipse.rcptt.tesla.swt.fragment.rap</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ </extraRequirements>
+ </dependency-resolution>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.recording.swt/pom.xml b/runtime/tesla/org.eclipse.rcptt.tesla.recording.swt/pom.xml
index abb7740..dae37a6 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.recording.swt/pom.xml
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.recording.swt/pom.xml
@@ -32,15 +32,6 @@
<plugin>
<groupId>${tycho-groupid}</groupId>
<artifactId>tycho-compiler-plugin</artifactId>
- <configuration>
- <extraClasspathElements>
- <extraClasspathElement>
- <groupId>org.eclipse.rcptt.tesla</groupId>
- <artifactId>org.eclipse.rcptt.tesla.swt.fragment</artifactId>
- <version>2.5.0-SNAPSHOT</version>
- </extraClasspathElement>
- </extraClasspathElements>
- </configuration>
<dependencies>
<dependency>
<groupId>org.eclipse.rcptt.tesla</groupId>
@@ -49,6 +40,21 @@
</dependency>
</dependencies>
</plugin>
+ <plugin>
+ <groupId>${tycho-groupid}</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <configuration>
+ <dependency-resolution>
+ <extraRequirements>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.eclipse.rcptt.tesla.swt.fragment</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ </extraRequirements>
+ </dependency-resolution>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.swt/pom.xml b/runtime/tesla/org.eclipse.rcptt.tesla.swt/pom.xml
index 94be50a..58baeb3 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.swt/pom.xml
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.swt/pom.xml
@@ -32,15 +32,6 @@
<plugin>
<groupId>${tycho-groupid}</groupId>
<artifactId>tycho-compiler-plugin</artifactId>
- <configuration>
- <extraClasspathElements>
- <extraClasspathElement>
- <groupId>org.eclipse.rcptt.tesla</groupId>
- <artifactId>org.eclipse.rcptt.tesla.swt.fragment</artifactId>
- <version>2.5.0-SNAPSHOT</version>
- </extraClasspathElement>
- </extraClasspathElements>
- </configuration>
<dependencies>
<dependency>
<groupId>org.eclipse.rcptt.tesla</groupId>
@@ -49,6 +40,21 @@
</dependency>
</dependencies>
</plugin>
+ <plugin>
+ <groupId>${tycho-groupid}</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <configuration>
+ <dependency-resolution>
+ <extraRequirements>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.eclipse.rcptt.tesla.swt.fragment</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ </extraRequirements>
+ </dependency-resolution>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
