From d0bf53474bb7f9c6eefefc261b77e76fc90572a8 Mon Sep 17 00:00:00 2001 From: Ben Liblit Date: Wed, 14 Feb 2018 15:11:00 -0600 Subject: [PATCH] Also get Eclipse JSDT from a P2 repository, but not the same one --- build.gradle | 6 ++++++ com.ibm.wala.ide.jsdt.tests/build.gradle | 2 +- com.ibm.wala.ide.jsdt/build.gradle | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index d16d470ca..2cc6bd966 100644 --- a/build.gradle +++ b/build.gradle @@ -34,6 +34,12 @@ p2AsMaven { iu 'org.eclipse.ui.ide' iu 'org.eclipse.ui.workbench' } + group 'wst-deps', { + repo 'http://download.eclipse.org/releases/oxygen' + slicingOption 'latestVersionOnly', 'true' + iu 'org.eclipse.wst.jsdt.core' + iu 'org.eclipse.wst.jsdt.ui' + } } diff --git a/com.ibm.wala.ide.jsdt.tests/build.gradle b/com.ibm.wala.ide.jsdt.tests/build.gradle index f49f2d5af..11ac609c5 100644 --- a/com.ibm.wala.ide.jsdt.tests/build.gradle +++ b/com.ibm.wala.ide.jsdt.tests/build.gradle @@ -6,8 +6,8 @@ dependencies { 'eclipse-deps:org.eclipse.equinox.common:+', 'eclipse-deps:org.eclipse.osgi:+', 'junit:junit:4.11', - 'org.eclipse.wst.jsdt:core:1.0.201.v2010012803', 'org.osgi:org.osgi.core:4.2.0', + 'wst-deps:org.eclipse.wst.jsdt.core:+', project(':com.ibm.wala.cast'), project(':com.ibm.wala.cast.js'), project(':com.ibm.wala.cast.js.rhino'), diff --git a/com.ibm.wala.ide.jsdt/build.gradle b/com.ibm.wala.ide.jsdt/build.gradle index 91afad457..809c0f5c0 100644 --- a/com.ibm.wala.ide.jsdt/build.gradle +++ b/com.ibm.wala.ide.jsdt/build.gradle @@ -7,8 +7,8 @@ dependencies { 'eclipse-deps:org.eclipse.equinox.common:+', 'eclipse-deps:org.eclipse.osgi:+', 'eclipse-deps:org.eclipse.ui.workbench:+', - 'org.eclipse.wst.jsdt:core:1.0.201.v2010012803', - 'org.eclipse.wst.jsdt:ui:1.0.201.v2010012803', + 'wst-deps:org.eclipse.wst.jsdt.core:+', + 'wst-deps:org.eclipse.wst.jsdt.ui:+', project(':com.ibm.wala.cast'), project(':com.ibm.wala.cast.js'), project(':com.ibm.wala.cast.js.rhino'),