diff options
author | Mikaël Barbero | 2014-06-23 19:42:04 +0000 |
---|---|---|
committer | Mikaël Barbero | 2014-06-23 19:49:16 +0000 |
commit | 17c3d6c9db1491207d237492f6df72f20d810fbd (patch) | |
tree | 72bd1ac81f31b9578d3139e2c2034bdb44d2ff8c | |
parent | b1b44d5068643c8ba95fa4a165521cb44b37f7fc (diff) | |
download | org.eclipse.emf.compare-17c3d6c9db1491207d237492f6df72f20d810fbd.tar.gz org.eclipse.emf.compare-17c3d6c9db1491207d237492f6df72f20d810fbd.tar.xz org.eclipse.emf.compare-17c3d6c9db1491207d237492f6df72f20d810fbd.zip |
Update to q7 runner 1.3.12
Change-Id: I90634495fa4af5c9990cfb7d45054ebcfd6b4135
-rw-r--r--[-rwxr-xr-x] | plugins/org.eclipse.emf.compare.q7.tests/createAUT.sh | 2 | ||||
-rw-r--r-- | plugins/org.eclipse.emf.compare.q7.tests/pom.xml | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/plugins/org.eclipse.emf.compare.q7.tests/createAUT.sh b/plugins/org.eclipse.emf.compare.q7.tests/createAUT.sh index 2fed6f5dd..2b577b512 100755..100644 --- a/plugins/org.eclipse.emf.compare.q7.tests/createAUT.sh +++ b/plugins/org.eclipse.emf.compare.q7.tests/createAUT.sh @@ -1,6 +1,6 @@ export P2_ADMIN_PATH="/jobs/genie.modeling.emfcompare/p2-admin/lastStable/archive/org.eclipselabs.equinox.p2.admin.product/target/products/org.eclipse.equinox.p2.admin.rcp.product/linux/gtk/x86_64/p2-admin" -alias p2-admin="${JAVA_HOME}/bin/java -jar $P2_ADMIN_PATH/plugins/org.eclipse.equinox.launcher_*.jar" +alias p2-admin="$P2_ADMIN_PATH/p2-admin" alias p2-director="p2-admin -application org.eclipse.equinox.p2.director" simrel=$1 diff --git a/plugins/org.eclipse.emf.compare.q7.tests/pom.xml b/plugins/org.eclipse.emf.compare.q7.tests/pom.xml index a334a6d1f..ec9675953 100644 --- a/plugins/org.eclipse.emf.compare.q7.tests/pom.xml +++ b/plugins/org.eclipse.emf.compare.q7.tests/pom.xml @@ -15,8 +15,8 @@ </pluginRepositories>
<properties>
- <q7-runner-version>1.3.11</q7-runner-version>
- <q7-maven-version>1.3.11</q7-maven-version>
+ <q7-runner-version>1.3.12</q7-runner-version>
+ <q7-maven-version>1.3.12</q7-maven-version>
<exec-maven-plugin-version>1.2.1</exec-maven-plugin-version>
</properties>
@@ -85,9 +85,6 @@ <properties>
<profile-id>kepler</profile-id>
</properties>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
<build>
<plugins>
<plugin>
|