Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Davis2016-05-30 14:26:08 -0400
committerSam Davis2016-05-30 20:01:45 -0400
commit267dfe3dd23a6ff1d319a755dffa88ee0bf59305 (patch)
treeb57a9a6abf9277d6db9e6921d0b5cbbc2eadcde6
parent0a9b253bcc347db40f4c039546b8c7d7ca219bdb (diff)
downloadorg.eclipse.mylyn-267dfe3dd23a6ff1d319a755dffa88ee0bf59305.tar.gz
org.eclipse.mylyn-267dfe3dd23a6ff1d319a755dffa88ee0bf59305.tar.xz
org.eclipse.mylyn-267dfe3dd23a6ff1d319a755dffa88ee0bf59305.zip
493281: Use both dependency resolution methods
Change-Id: Iecf78247183dbec2dfceb38d12d5c48efcdf59c8 Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=493281
-rw-r--r--org.eclipse.mylyn-parent/pom.xml19
-rw-r--r--org.eclipse.mylyn.maven-parent/pom.xml19
-rw-r--r--org.eclipse.mylyn.tests/pom.xml37
3 files changed, 63 insertions, 12 deletions
diff --git a/org.eclipse.mylyn-parent/pom.xml b/org.eclipse.mylyn-parent/pom.xml
index e15fa7d..09f1f82 100644
--- a/org.eclipse.mylyn-parent/pom.xml
+++ b/org.eclipse.mylyn-parent/pom.xml
@@ -5,11 +5,11 @@
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
http://www.eclipse.org/legal/epl-v10.html
-
+
Contributors:
Tasktop Technologies - initial API and implementation
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
+<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -98,7 +98,7 @@
<url>https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced;classification=Mylyn</url>
<system>Bugzilla</system>
</issueManagement>
-
+
<distributionManagement>
<repository>
<id>repo.eclipse.org</id>
@@ -415,7 +415,7 @@
<alt-platform-repository-url>http://download.eclipse.org/releases/staging/</alt-platform-repository-url>
</properties>
</profile>
-
+
<!-- OS and machine specific profiles -->
<profile>
<id>coverage-initializer</id>
@@ -756,14 +756,21 @@
<product>org.eclipse.sdk.ide</product>
<application>org.eclipse.ui.ide.workbench</application>
<argLine>${tycho.testArgLine} -Xmx512m -XX:MaxPermSize=256m -Djava.io.tmpdir=${project.build.directory} ${test.vmargs}</argLine>
- <appArgLine>${test.args}</appArgLine>
- <!--
+ <appArgLine>${test.args}</appArgLine>
+ <!--
<environmentVariables>
<http_proxy>${http_proxy}</http_proxy>
<https_proxy>${https_proxy}</https_proxy>
</environmentVariables>
-->
<application>org.eclipse.ui.ide.workbench</application>
+ <dependencies>
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.eclipse.sdk.feature.group</artifactId>
+ <version>${platform-version}</version>
+ </dependency>
+ </dependencies>
<dependency-resolution>
<extraRequirements>
<requirement>
diff --git a/org.eclipse.mylyn.maven-parent/pom.xml b/org.eclipse.mylyn.maven-parent/pom.xml
index 0428146..407cde9 100644
--- a/org.eclipse.mylyn.maven-parent/pom.xml
+++ b/org.eclipse.mylyn.maven-parent/pom.xml
@@ -5,11 +5,11 @@
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
http://www.eclipse.org/legal/epl-v10.html
-
+
Contributors:
Tasktop Technologies - initial API and implementation
-->
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
@@ -30,7 +30,7 @@
<sign.skip>true</sign.skip>
<sign.alias>default</sign.alias>
-
+
<coverage.skip>true</coverage.skip>
<coverage.filter></coverage.filter>
<coverage.destFile>../target/jacoco.exec</coverage.destFile>
@@ -92,7 +92,7 @@
</activation>
<properties>
<test.windows.skip>${test.skip}</test.windows.skip>
- </properties>
+ </properties>
</profile>
<profile>
<id>linux</id>
@@ -104,7 +104,7 @@
</activation>
<properties>
<test.linux.skip>${test.skip}</test.linux.skip>
- </properties>
+ </properties>
</profile>
</profiles>
@@ -258,9 +258,16 @@
<exclude>**/Test*java</exclude>
</excludes>
<argLine>${tycho.testArgLine} -Xmx512m -XX:MaxPermSize=256m -Djava.io.tmpdir=${project.build.directory} ${test.vmargs}</argLine>
- <appArgLine>${test.args}</appArgLine>
+ <appArgLine>${test.args}</appArgLine>
<application>org.eclipse.ui.ide.workbench</application>
<!-- <product>org.eclipse.sdk.ide</product> -->
+ <dependencies>
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.eclipse.sdk.feature.group</artifactId>
+ <version>0.0.0</version>
+ </dependency>
+ </dependencies>
<dependency-resolution>
<extraRequirements>
<requirement>
diff --git a/org.eclipse.mylyn.tests/pom.xml b/org.eclipse.mylyn.tests/pom.xml
index 658b31d..cd21fae 100644
--- a/org.eclipse.mylyn.tests/pom.xml
+++ b/org.eclipse.mylyn.tests/pom.xml
@@ -43,6 +43,43 @@
<explodedBundles>
<explodedBundle>org.eclipse.mylyn.bugzilla.tests</explodedBundle>
</explodedBundles>
+ <dependencies>
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.eclipse.sdk.feature.group</artifactId>
+ <version>${platform-version}</version>
+ </dependency>
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.eclipse.mylyn.sdk_feature.feature.group</artifactId>
+ <version>0.0.0</version>
+ </dependency>
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.eclipse.mylyn.context.sdk.feature.group</artifactId>
+ <version>0.0.0</version>
+ </dependency>
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.eclipse.mylyn.docs.sdk.feature.group</artifactId>
+ <version>0.0.0</version>
+ </dependency>
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.eclipse.cdt.mylyn.feature.group</artifactId>
+ <version>0.0.0</version>
+ </dependency>
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.eclipse.mylyn.gerrit.feature.feature.group</artifactId>
+ <version>0.0.0</version>
+ </dependency>
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.eclipse.mylyn.hudson.feature.group</artifactId>
+ <version>0.0.0</version>
+ </dependency>
+ </dependencies>
<dependency-resolution>
<extraRequirements>
<requirement>

Back to the top