summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rapicault (Ericsson)2013-04-16 20:41:21 (EDT)
committerPascal Rapicault2013-04-16 20:41:21 (EDT)
commit00935bd6d00d72d34c9220478c61f7ad9aaaa770 (patch)
tree2ecca8d3eec18f06cbd429c468e85be557d99e40
parent236e938fb2d3831c82d35999f230c1616fa2513a (diff)
downloadrt.equinox.p2-00935bd6d00d72d34c9220478c61f7ad9aaaa770.zip
rt.equinox.p2-00935bd6d00d72d34c9220478c61f7ad9aaaa770.tar.gz
rt.equinox.p2-00935bd6d00d72d34c9220478c61f7ad9aaaa770.tar.bz2
Bug 405830 - Force execution environment to 1.7
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/pom.xml59
1 files changed, 22 insertions, 37 deletions
diff --git a/bundles/org.eclipse.equinox.p2.tests/pom.xml b/bundles/org.eclipse.equinox.p2.tests/pom.xml
index 7dc035a..6a475a6 100644
--- a/bundles/org.eclipse.equinox.p2.tests/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.tests/pom.xml
@@ -1,15 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2012 Eclipse Foundation.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Distribution License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/org/documents/edl-v10.php
-
- Contributors:
- Igor Fedorenko - initial implementation
--->
-<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/xsd/maven-4.0.0.xsd">
+<!-- Copyright (c) 2012 Eclipse Foundation. All rights reserved. This program
+ and the accompanying materials are made available under the terms of the
+ Eclipse Distribution License v1.0 which accompanies this distribution, and
+ is available at http://www.eclipse.org/org/documents/edl-v10.php Contributors:
+ Igor Fedorenko - initial implementation -->
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -23,44 +19,33 @@
<artifactId>org.eclipse.equinox.p2.tests</artifactId>
<version>1.5.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
-
+
<properties>
<platform.archive.name>eclipse-indigo-platform.tar.gz</platform.archive.name>
</properties>
<build>
<plugins>
-
-<!-- <plugin> -->
-<!-- <groupId>org.apache.maven.plugins</groupId> -->
-<!-- <artifactId>maven-antrun-plugin</artifactId> -->
-<!-- <version>1.6</version> -->
-<!-- <executions> -->
-<!-- <execution> -->
-<!-- <id>compile</id> -->
-<!-- <phase>compile</phase> -->
-<!-- <configuration> -->
-<!-- <target> -->
-<!-- <ant antfile="${basedir}/download.eclipse.platform.for.p2.migration.tests.xml"> -->
-<!-- <target name="download.eclipse.platform"/> -->
-<!-- </ant> -->
-<!-- </target> -->
-<!-- </configuration> -->
-<!-- <goals> -->
-<!-- <goal>run</goal> -->
-<!-- </goals> -->
-<!-- </execution> -->
-<!-- </executions> -->
-<!-- </plugin> -->
-
-
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <configuration>
+ <executionEnvironment>JavaSE-1.7</executionEnvironment>
+ </configuration>
+ </plugin>
+
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
<configuration>
<testSuite>org.eclipse.equinox.p2.tests</testSuite>
<testClass>org.eclipse.equinox.p2.tests.AutomatedTests</testClass>
- <argLine>-Xmx512m -Dorg.eclipse.equinox.p2.reconciler.tests.platform.archive=${platform.archive.name} -Dorg.eclipse.equinox.p2.reconciler.tests.35.platform.archive=${platform.archive.name} -Dorg.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive=${platform.archive.name} -Dorg.eclipse.equinox.p2.repository -Dorg.eclipse.equinox.p2.transport.ecf.retry=5</argLine>
+ <argLine>-Xmx512m
+ -Dorg.eclipse.equinox.p2.reconciler.tests.platform.archive=${platform.archive.name}
+ -Dorg.eclipse.equinox.p2.reconciler.tests.35.platform.archive=${platform.archive.name}
+ -Dorg.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive=${platform.archive.name}
+ -Dorg.eclipse.equinox.p2.repository
+ -Dorg.eclipse.equinox.p2.transport.ecf.retry=5</argLine>
<appArgLine>-consoleLog</appArgLine>
<bundleStartLevel>
<bundle>