diff options
| -rw-r--r-- | org.eclipse.egit.mylyn.ui.test/pom.xml | 77 | ||||
| -rw-r--r-- | org.eclipse.egit.ui.test/pom.xml | 69 | ||||
| -rw-r--r-- | pom.xml | 2 |
3 files changed, 78 insertions, 70 deletions
diff --git a/org.eclipse.egit.mylyn.ui.test/pom.xml b/org.eclipse.egit.mylyn.ui.test/pom.xml index 45051503e4..93e1cafa25 100644 --- a/org.eclipse.egit.mylyn.ui.test/pom.xml +++ b/org.eclipse.egit.mylyn.ui.test/pom.xml @@ -66,53 +66,58 @@ <plugins> <plugin> <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-surefire-plugin</artifactId> + <artifactId>target-platform-configuration</artifactId> <version>${tycho-version}</version> <configuration> - <includes> - <include>**/*Test.java</include> - </includes> - <useUIHarness>true</useUIHarness> - <useUIThread>true</useUIThread> - <product>org.eclipse.sdk.ide</product> - <argLine>${ui.test.vmargs}</argLine> - <application>org.eclipse.ui.ide.workbench</application> <dependency-resolution> <extraRequirements> <requirement> <type>eclipse-feature</type> + <id>org.eclipse.jgit</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-feature</type> <id>org.eclipse.jgit.java7</id> <versionRange>0.0.0</versionRange> </requirement> + <requirement> + <type>eclipse-feature</type> + <id>org.eclipse.egit</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-feature</type> + <id>org.eclipse.egit.mylyn</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-feature</type> + <id>org.eclipse.pde</id> + <versionRange>${platform-version}</versionRange> + </requirement> + <requirement> + <type>eclipse-feature</type> + <id>org.eclipse.cvs</id> + <versionRange>[1.1.2,2.0.0)</versionRange> + </requirement> </extraRequirements> </dependency-resolution> - <dependencies> - <dependency> - <type>p2-installable-unit</type> - <artifactId>org.eclipse.egit.feature.group</artifactId> - <version>3.6.0</version> - </dependency> - <dependency> - <type>p2-installable-unit</type> - <artifactId>org.eclipse.egit.mylyn.feature.group</artifactId> - <version>3.6.0</version> - </dependency> - <dependency> - <type>p2-installable-unit</type> - <artifactId>org.eclipse.jgit.feature.group</artifactId> - <version>3.6.0</version> - </dependency> - <dependency> - <type>p2-installable-unit</type> - <artifactId>org.eclipse.pde.feature.group</artifactId> - <version>${platform-version}</version> - </dependency> - <dependency> - <type>p2-installable-unit</type> - <artifactId>org.eclipse.cvs.feature.group</artifactId> - <version>[1.1.2,2.0.0)</version> - </dependency> - </dependencies> + </configuration> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-surefire-plugin</artifactId> + <version>${tycho-version}</version> + <configuration> + <includes> + <include>**/*Test.java</include> + </includes> + <useUIHarness>true</useUIHarness> + <useUIThread>true</useUIThread> + <product>org.eclipse.sdk.ide</product> + <argLine>${ui.test.vmargs}</argLine> + <application>org.eclipse.ui.ide.workbench</application> </configuration> </plugin> </plugins> diff --git a/org.eclipse.egit.ui.test/pom.xml b/org.eclipse.egit.ui.test/pom.xml index dbdba1c58d..2bf2348537 100644 --- a/org.eclipse.egit.ui.test/pom.xml +++ b/org.eclipse.egit.ui.test/pom.xml @@ -70,50 +70,53 @@ <plugins> <plugin> <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-surefire-plugin</artifactId> + <artifactId>target-platform-configuration</artifactId> <version>${tycho-version}</version> <configuration> - <includes> - <include>**/*Test.java</include> - </includes> - <useUIHarness>true</useUIHarness> - <useUIThread>false</useUIThread> - <product>org.eclipse.sdk.ide</product> - <argLine>${ui.test.vmargs}</argLine> - <application>org.eclipse.ui.ide.workbench</application> <dependency-resolution> <extraRequirements> <requirement> <type>eclipse-feature</type> + <id>org.eclipse.jgit</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-feature</type> <id>org.eclipse.jgit.java7</id> <versionRange>0.0.0</versionRange> </requirement> + <requirement> + <type>eclipse-feature</type> + <id>org.eclipse.egit</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-feature</type> + <id>org.eclipse.pde</id> + <versionRange>${platform-version}</versionRange> + </requirement> + <requirement> + <type>eclipse-feature</type> + <id>org.eclipse.cvs</id> + <versionRange>[1.1.2,2.0.0)</versionRange> + </requirement> </extraRequirements> </dependency-resolution> - <dependencies> - <dependency> - <type>p2-installable-unit</type> - <groupId>org.eclipse.egit.feature</groupId> - <artifactId>org.eclipse.egit.feature.group</artifactId> - <version>3.6.0</version> - </dependency> - <dependency> - <type>p2-installable-unit</type> - <groupId>org.eclipse.jgit.feature</groupId> - <artifactId>org.eclipse.jgit.feature.group</artifactId> - <version>3.6.0</version> - </dependency> - <dependency> - <type>p2-installable-unit</type> - <artifactId>org.eclipse.pde.feature.group</artifactId> - <version>${platform-version}</version> - </dependency> - <dependency> - <type>p2-installable-unit</type> - <artifactId>org.eclipse.cvs.feature.group</artifactId> - <version>[1.1.2,2.0.0)</version> - </dependency> - </dependencies> + </configuration> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-surefire-plugin</artifactId> + <version>${tycho-version}</version> + <configuration> + <includes> + <include>**/*Test.java</include> + </includes> + <useUIHarness>true</useUIHarness> + <useUIThread>false</useUIThread> + <product>org.eclipse.sdk.ide</product> + <argLine>${ui.test.vmargs}</argLine> + <application>org.eclipse.ui.ide.workbench</application> </configuration> </plugin> </plugins> @@ -63,7 +63,7 @@ <properties> <egit-version>3.6.0-SNAPSHOT</egit-version> - <tycho-version>0.20.0</tycho-version> + <tycho-version>0.21.0</tycho-version> <tycho-extras-version>${tycho-version}</tycho-extras-version> <mockito-version>1.8.4</mockito-version> <junit-version>4.11</junit-version> |