From b6af5267f1304b2758c923f194a25d3ed9a7e6b0 Mon Sep 17 00:00:00 2001 From: Julian Dolby Date: Fri, 25 Aug 2017 10:58:00 -0400 Subject: [PATCH] java 8 changes minor fixes, such as making CheckForFrontEndErrors more accessible minor hacks to make stuff compile with TeaVM --- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- com.ibm.wala.cast.java/META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../build.properties | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- com.ibm.wala.cast.js.nodejs/build.properties | 1 + .../js/nodejs/NodejsCallGraphBuilderUtil.java | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../ibm/wala/cast/js/rhino/test/PrintIRs.java | 3 +- .../test/TestSimpleCallGraphShapeRhino.java | 3 +- .../TestSimplePageCallGraphShapeRhino.java | 3 +- ...tSimplePageCallGraphShapeRhinoJericho.java | 3 +- .../META-INF/MANIFEST.MF | 2 +- ...rg.eclipse.wst.jsdt.ui.superType.container | 2 +- .../org.eclipse.wst.jsdt.ui.superType.name | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../wala/cast/js/test/FieldBasedCGUtil.java | 3 +- .../cast/js/test/JSCallGraphBuilderUtil.java | 2 +- .../cast/js/test/TestArgumentSensitivity.java | 2 +- com.ibm.wala.cast.js/META-INF/MANIFEST.MF | 2 +- .../correlations/CorrelationFinder.java | 3 +- .../com/ibm/wala/cast/js/util/Util.java | 33 ------------------- com.ibm.wala.cast.test/META-INF/MANIFEST.MF | 2 +- com.ibm.wala.cast.test/harness-src/c/Makefile | 2 +- com.ibm.wala.cast/META-INF/MANIFEST.MF | 2 +- com.ibm.wala.cast/source/c/Makefile | 4 +-- .../callgraph/DelegatingAstPointerKeys.java | 2 +- com.ibm.wala.core.testdata/build.properties | 2 +- com.ibm.wala.core.tests/META-INF/MANIFEST.MF | 2 +- .../ContextInsensitiveReachingDefs.java | 2 +- com.ibm.wala.core/META-INF/MANIFEST.MF | 2 +- .../demandpa/alg/SimpleDemandPointsTo.java | 20 +++++------ .../src/com/ibm/wala/ipa/slicer/Slicer.java | 2 +- .../src/com/ibm/wala/types/TypeName.java | 2 +- com.ibm.wala.dalvik.test/META-INF/MANIFEST.MF | 2 +- com.ibm.wala.dalvik.test/build.properties | 2 +- com.ibm.wala.dalvik/META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- com.ibm.wala.ide.jdt.test/build.properties | 2 +- com.ibm.wala.ide.jdt/META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- com.ibm.wala.ide.jsdt/META-INF/MANIFEST.MF | 2 +- com.ibm.wala.ide.tests/META-INF/MANIFEST.MF | 2 +- com.ibm.wala.ide/META-INF/MANIFEST.MF | 2 +- com.ibm.wala.scandroid/META-INF/MANIFEST.MF | 2 +- com.ibm.wala.shrike/META-INF/MANIFEST.MF | 2 +- com.ibm.wala.util/META-INF/MANIFEST.MF | 2 +- pom.xml | 1 + targets/e47/e47.target | 2 +- 53 files changed, 62 insertions(+), 99 deletions(-) diff --git a/com.ibm.wala.cast.java.ecj/META-INF/MANIFEST.MF b/com.ibm.wala.cast.java.ecj/META-INF/MANIFEST.MF index b163e7f52..9e0c938c7 100644 --- a/com.ibm.wala.cast.java.ecj/META-INF/MANIFEST.MF +++ b/com.ibm.wala.cast.java.ecj/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %Bundle-Name Bundle-SymbolicName: com.ibm.wala.cast.java.ecj Bundle-Version: 1.4.4.qualifier Bundle-Vendor: %Bundle-Vendor -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: com.ibm.wala.cast.java, com.ibm.wala.core, org.eclipse.core.runtime, diff --git a/com.ibm.wala.cast.java.test.data/META-INF/MANIFEST.MF b/com.ibm.wala.cast.java.test.data/META-INF/MANIFEST.MF index 28478eb4d..d3559f6f8 100644 --- a/com.ibm.wala.cast.java.test.data/META-INF/MANIFEST.MF +++ b/com.ibm.wala.cast.java.test.data/META-INF/MANIFEST.MF @@ -4,4 +4,4 @@ Bundle-Name: %Bundle-Name Bundle-SymbolicName: com.ibm.wala.cast.java.test.data Bundle-Version: 1.4.4.qualifier Bundle-Vendor: %Bundle-Vendor -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/com.ibm.wala.cast.java.test/META-INF/MANIFEST.MF b/com.ibm.wala.cast.java.test/META-INF/MANIFEST.MF index 04ef7ec76..f42a6a393 100644 --- a/com.ibm.wala.cast.java.test/META-INF/MANIFEST.MF +++ b/com.ibm.wala.cast.java.test/META-INF/MANIFEST.MF @@ -14,4 +14,4 @@ Require-Bundle: com.ibm.wala.core.tests, org.junit;bundle-version="4.0.0" Bundle-ActivationPolicy: lazy Export-Package: com.ibm.wala.cast.java.test -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/com.ibm.wala.cast.java/META-INF/MANIFEST.MF b/com.ibm.wala.cast.java/META-INF/MANIFEST.MF index 0a7ce9b93..97000fb92 100644 --- a/com.ibm.wala.cast.java/META-INF/MANIFEST.MF +++ b/com.ibm.wala.cast.java/META-INF/MANIFEST.MF @@ -20,4 +20,4 @@ Export-Package: com.ibm.wala.cast.java.analysis.typeInference, com.ibm.wala.cast.java.translator, com.ibm.wala.cast.java.types Bundle-ClassPath: . -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/com.ibm.wala.cast.js.html.nu_validator/META-INF/MANIFEST.MF b/com.ibm.wala.cast.js.html.nu_validator/META-INF/MANIFEST.MF index ec0810e28..bec69733e 100644 --- a/com.ibm.wala.cast.js.html.nu_validator/META-INF/MANIFEST.MF +++ b/com.ibm.wala.cast.js.html.nu_validator/META-INF/MANIFEST.MF @@ -13,6 +13,6 @@ Require-Bundle: com.ibm.wala.cast.js;bundle-version="1.0.0", com.ibm.wala.core.tests;bundle-version="1.1.3", com.ibm.wala.core;bundle-version="1.1.3", org.junit;bundle-version="4.8.1" -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ClassPath: ., lib/htmlparser-1.4.jar diff --git a/com.ibm.wala.cast.js.html.nu_validator/build.properties b/com.ibm.wala.cast.js.html.nu_validator/build.properties index 05251c6c8..2608e273f 100644 --- a/com.ibm.wala.cast.js.html.nu_validator/build.properties +++ b/com.ibm.wala.cast.js.html.nu_validator/build.properties @@ -8,4 +8,4 @@ bin.includes = META-INF/,\ jars.extra.classpath = lib/htmlparser-1.4.jar javacProjectSettings = true output.. = bin/ - \ No newline at end of file + diff --git a/com.ibm.wala.cast.js.nodejs.test/META-INF/MANIFEST.MF b/com.ibm.wala.cast.js.nodejs.test/META-INF/MANIFEST.MF index 99502eba4..7c38ef4e5 100644 --- a/com.ibm.wala.cast.js.nodejs.test/META-INF/MANIFEST.MF +++ b/com.ibm.wala.cast.js.nodejs.test/META-INF/MANIFEST.MF @@ -18,4 +18,4 @@ Require-Bundle: com.ibm.wala.cast.js.nodejs;bundle-version="1.3.10", com.ibm.wala.cast.js.rhino;bundle-version="1.3.10", com.ibm.wala.core;bundle-version="1.3.10", org.junit -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/com.ibm.wala.cast.js.nodejs/META-INF/MANIFEST.MF b/com.ibm.wala.cast.js.nodejs/META-INF/MANIFEST.MF index 93d772eef..08f676ddb 100644 --- a/com.ibm.wala.cast.js.nodejs/META-INF/MANIFEST.MF +++ b/com.ibm.wala.cast.js.nodejs/META-INF/MANIFEST.MF @@ -9,4 +9,4 @@ Require-Bundle: com.ibm.wala.cast.js;bundle-version="1.3.10", com.ibm.wala.cast.js.rhino;bundle-version="1.3.10" Bundle-ClassPath: lib/json-20160212.jar, . -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/com.ibm.wala.cast.js.nodejs/build.properties b/com.ibm.wala.cast.js.nodejs/build.properties index 1e594bfcb..9c86a3abf 100644 --- a/com.ibm.wala.cast.js.nodejs/build.properties +++ b/com.ibm.wala.cast.js.nodejs/build.properties @@ -11,3 +11,4 @@ javacProjectSettings = true bin.excludes = dat/core-modules/.eslintrc,\ dat/core-modules/.gitignore,\ dat/core-modules/.gitkeep +javacDefaultEncoding.. = UTF-8 diff --git a/com.ibm.wala.cast.js.nodejs/src/com/ibm/wala/cast/js/nodejs/NodejsCallGraphBuilderUtil.java b/com.ibm.wala.cast.js.nodejs/src/com/ibm/wala/cast/js/nodejs/NodejsCallGraphBuilderUtil.java index 6a5b3fdc2..d41042c36 100644 --- a/com.ibm.wala.cast.js.nodejs/src/com/ibm/wala/cast/js/nodejs/NodejsCallGraphBuilderUtil.java +++ b/com.ibm.wala.cast.js.nodejs/src/com/ibm/wala/cast/js/nodejs/NodejsCallGraphBuilderUtil.java @@ -80,7 +80,7 @@ public class NodejsCallGraphBuilderUtil extends JSCallGraphUtil { CAstAnalysisScope scope = new CAstAnalysisScope(files, loaders, languages); IClassHierarchy cha = ClassHierarchyFactory.make(scope, loaders, language, null); - com.ibm.wala.cast.js.util.Util.checkForFrontEndErrors(cha); + com.ibm.wala.cast.util.Util.checkForFrontEndErrors(cha); // Make Script Roots Iterable roots = new JavaScriptEntryPoints(cha, loaders.getTheLoader()); diff --git a/com.ibm.wala.cast.js.rhino.test/META-INF/MANIFEST.MF b/com.ibm.wala.cast.js.rhino.test/META-INF/MANIFEST.MF index 07b00daa4..5f63ec99b 100644 --- a/com.ibm.wala.cast.js.rhino.test/META-INF/MANIFEST.MF +++ b/com.ibm.wala.cast.js.rhino.test/META-INF/MANIFEST.MF @@ -14,7 +14,7 @@ Require-Bundle: com.ibm.wala.cast.js.rhino;bundle-version="1.0.0", com.ibm.wala.cast.js.test.data;bundle-version="1.3.4", com.ibm.wala.shrike;bundle-version="1.3.4", org.junit;bundle-version="4.0.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Export-Package: com.ibm.wala.cast.js.examples.hybrid, com.ibm.wala.cast.js.rhino.callgraph.fieldbased.test, diff --git a/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/rhino/test/PrintIRs.java b/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/rhino/test/PrintIRs.java index e532b6be9..c3572a277 100644 --- a/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/rhino/test/PrintIRs.java +++ b/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/rhino/test/PrintIRs.java @@ -28,7 +28,6 @@ import com.ibm.wala.cast.js.ipa.callgraph.JSCallGraphUtil; import com.ibm.wala.cast.js.loader.JavaScriptLoader; import com.ibm.wala.cast.js.loader.JavaScriptLoaderFactory; import com.ibm.wala.cast.js.translator.CAstRhinoTranslatorFactory; -import com.ibm.wala.cast.js.util.Util; import com.ibm.wala.cast.loader.AstMethod; import com.ibm.wala.cast.types.AstMethodReference; import com.ibm.wala.classLoader.IClass; @@ -101,7 +100,7 @@ public class PrintIRs { JavaScriptLoaderFactory loaders = new WebPageLoaderFactory(JSCallGraphUtil.getTranslatorFactory()); CAstAnalysisScope scope = new CAstAnalysisScope(scripts, loaders, Collections.singleton(JavaScriptLoader.JS)); IClassHierarchy cha = ClassHierarchyFactory.make(scope, loaders, JavaScriptLoader.JS); - Util.checkForFrontEndErrors(cha); + com.ibm.wala.cast.util.Util.checkForFrontEndErrors(cha); printIRsForCHA(cha, new Predicate() { @Override diff --git a/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/test/TestSimpleCallGraphShapeRhino.java b/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/test/TestSimpleCallGraphShapeRhino.java index 8e0b85fd3..e464df5a1 100644 --- a/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/test/TestSimpleCallGraphShapeRhino.java +++ b/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/test/TestSimpleCallGraphShapeRhino.java @@ -17,7 +17,6 @@ import org.junit.Test; import com.ibm.wala.cast.js.ipa.callgraph.JSCFABuilder; import com.ibm.wala.cast.js.translator.CAstRhinoTranslatorFactory; -import com.ibm.wala.cast.js.util.Util; import com.ibm.wala.ipa.callgraph.propagation.PropagationCallGraphBuilder; import com.ibm.wala.util.CancelException; import com.ibm.wala.util.WalaException; @@ -82,7 +81,7 @@ public class TestSimpleCallGraphShapeRhino extends TestSimpleCallGraphShape { public void testParseError() throws IllegalArgumentException, IOException, CancelException, WalaException { PropagationCallGraphBuilder B = JSCallGraphBuilderUtil.makeScriptCGBuilder("tests", "portal-example-simple.html"); B.makeCallGraph(B.getOptions()); - Util.checkForFrontEndErrors(B.getClassHierarchy()); + com.ibm.wala.cast.util.Util.checkForFrontEndErrors(B.getClassHierarchy()); } } diff --git a/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/test/TestSimplePageCallGraphShapeRhino.java b/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/test/TestSimplePageCallGraphShapeRhino.java index 41737640a..cea6a524f 100644 --- a/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/test/TestSimplePageCallGraphShapeRhino.java +++ b/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/test/TestSimplePageCallGraphShapeRhino.java @@ -22,7 +22,6 @@ import com.ibm.wala.cast.js.html.JSSourceExtractor; import com.ibm.wala.cast.js.html.WebUtil; import com.ibm.wala.cast.js.ipa.callgraph.JSCFABuilder; import com.ibm.wala.cast.js.translator.CAstRhinoTranslatorFactory; -import com.ibm.wala.cast.js.util.Util; import com.ibm.wala.ipa.callgraph.CallGraph; import com.ibm.wala.util.CancelException; import com.ibm.wala.util.WalaException; @@ -45,7 +44,7 @@ public abstract class TestSimplePageCallGraphShapeRhino extends TestSimplePageCa URL url = getClass().getClassLoader().getResource("pages/garbage2.html"); JSCFABuilder B = JSCallGraphBuilderUtil.makeHTMLCGBuilder(url, DefaultSourceExtractor.factory); B.makeCallGraph(B.getOptions()); - Util.checkForFrontEndErrors(B.getClassHierarchy()); + com.ibm.wala.cast.util.Util.checkForFrontEndErrors(B.getClassHierarchy()); } public static void main(String[] args) { diff --git a/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/test/TestSimplePageCallGraphShapeRhinoJericho.java b/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/test/TestSimplePageCallGraphShapeRhinoJericho.java index 4b2bf4c9c..1d275aa69 100644 --- a/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/test/TestSimplePageCallGraphShapeRhinoJericho.java +++ b/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/test/TestSimplePageCallGraphShapeRhinoJericho.java @@ -18,7 +18,6 @@ import com.ibm.wala.cast.js.html.DefaultSourceExtractor; import com.ibm.wala.cast.js.html.IHtmlParser; import com.ibm.wala.cast.js.html.jericho.JerichoHtmlParser; import com.ibm.wala.cast.js.ipa.callgraph.JSCFABuilder; -import com.ibm.wala.cast.js.util.Util; import com.ibm.wala.ipa.callgraph.CallGraph; import com.ibm.wala.util.CancelException; import com.ibm.wala.util.WalaException; @@ -36,7 +35,7 @@ public class TestSimplePageCallGraphShapeRhinoJericho extends TestSimplePageCall URL url = getClass().getClassLoader().getResource("pages/garbage.html"); JSCFABuilder B = JSCallGraphBuilderUtil.makeHTMLCGBuilder(url, DefaultSourceExtractor.factory); B.makeCallGraph(B.getOptions()); - Util.checkForFrontEndErrors(B.getClassHierarchy()); + com.ibm.wala.cast.util.Util.checkForFrontEndErrors(B.getClassHierarchy()); } public static void main(String[] args) { diff --git a/com.ibm.wala.cast.js.rhino/META-INF/MANIFEST.MF b/com.ibm.wala.cast.js.rhino/META-INF/MANIFEST.MF index 7b5226f3b..2c19f0ca8 100644 --- a/com.ibm.wala.cast.js.rhino/META-INF/MANIFEST.MF +++ b/com.ibm.wala.cast.js.rhino/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Vendor: %Bundle-Vendor Require-Bundle: com.ibm.wala.cast;bundle-version="1.0.0", com.ibm.wala.cast.js;bundle-version="1.0.0", com.ibm.wala.core;bundle-version="1.1.3" -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Export-Package: com.ibm.wala.cast.js.translator, org.mozilla.classfile, diff --git a/com.ibm.wala.cast.js.test.data/.settings/org.eclipse.wst.jsdt.ui.superType.container b/com.ibm.wala.cast.js.test.data/.settings/org.eclipse.wst.jsdt.ui.superType.container index 49c8cd4f1..b311f6ebb 100644 --- a/com.ibm.wala.cast.js.test.data/.settings/org.eclipse.wst.jsdt.ui.superType.container +++ b/com.ibm.wala.cast.js.test.data/.settings/org.eclipse.wst.jsdt.ui.superType.container @@ -1 +1 @@ -org.eclipse.wst.jsdt.launching.JRE_CONTAINER \ No newline at end of file +org.eclipse.wst.jsdt.launching.JRE_CONTAINER diff --git a/com.ibm.wala.cast.js.test.data/.settings/org.eclipse.wst.jsdt.ui.superType.name b/com.ibm.wala.cast.js.test.data/.settings/org.eclipse.wst.jsdt.ui.superType.name index 11006e2a5..a7e371ddc 100644 --- a/com.ibm.wala.cast.js.test.data/.settings/org.eclipse.wst.jsdt.ui.superType.name +++ b/com.ibm.wala.cast.js.test.data/.settings/org.eclipse.wst.jsdt.ui.superType.name @@ -1 +1 @@ -Global \ No newline at end of file +Global diff --git a/com.ibm.wala.cast.js.test.data/META-INF/MANIFEST.MF b/com.ibm.wala.cast.js.test.data/META-INF/MANIFEST.MF index d4b96072e..1436df11d 100644 --- a/com.ibm.wala.cast.js.test.data/META-INF/MANIFEST.MF +++ b/com.ibm.wala.cast.js.test.data/META-INF/MANIFEST.MF @@ -7,4 +7,4 @@ Bundle-Version: 1.4.4.qualifier Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-ClassPath: examples-src/ -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/com.ibm.wala.cast.js.test/META-INF/MANIFEST.MF b/com.ibm.wala.cast.js.test/META-INF/MANIFEST.MF index bf5af16fa..3b723b472 100644 --- a/com.ibm.wala.cast.js.test/META-INF/MANIFEST.MF +++ b/com.ibm.wala.cast.js.test/META-INF/MANIFEST.MF @@ -13,4 +13,4 @@ Require-Bundle: com.ibm.wala.cast.js, com.ibm.wala.cast.js.test.data;bundle-version="1.3.4", org.junit;bundle-version="4.0.0" Export-Package: com.ibm.wala.cast.js.test -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/FieldBasedCGUtil.java b/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/FieldBasedCGUtil.java index eaeb5239c..c58b3a032 100644 --- a/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/FieldBasedCGUtil.java +++ b/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/FieldBasedCGUtil.java @@ -31,7 +31,6 @@ import com.ibm.wala.cast.js.ipa.callgraph.JSCallGraphUtil; import com.ibm.wala.cast.js.loader.JavaScriptLoader; import com.ibm.wala.cast.js.loader.JavaScriptLoaderFactory; import com.ibm.wala.cast.js.translator.JavaScriptTranslatorFactory; -import com.ibm.wala.cast.js.util.Util; import com.ibm.wala.classLoader.Module; import com.ibm.wala.classLoader.SourceModule; import com.ibm.wala.classLoader.SourceURLModule; @@ -126,7 +125,7 @@ public class FieldBasedCGUtil { public Pair> buildCG(JavaScriptLoaderFactory loaders, Module[] scripts, BuilderType builderType, IProgressMonitor monitor, boolean supportFullPointerAnalysis) throws WalaException, CancelException { CAstAnalysisScope scope = new CAstAnalysisScope(scripts, loaders, Collections.singleton(JavaScriptLoader.JS)); IClassHierarchy cha = ClassHierarchyFactory.make(scope, loaders, JavaScriptLoader.JS); - Util.checkForFrontEndErrors(cha); + com.ibm.wala.cast.util.Util.checkForFrontEndErrors(cha); Iterable roots = JSCallGraphUtil.makeScriptRoots(cha); IAnalysisCacheView cache = new AnalysisCacheImpl(AstIRFactory.makeDefaultFactory()); final FieldBasedCallGraphBuilder builder = builderType.fieldBasedCallGraphBuilderFactory(cha, diff --git a/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/JSCallGraphBuilderUtil.java b/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/JSCallGraphBuilderUtil.java index 3155b4360..bd00937a8 100644 --- a/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/JSCallGraphBuilderUtil.java +++ b/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/JSCallGraphBuilderUtil.java @@ -227,7 +227,7 @@ public class JSCallGraphBuilderUtil extends com.ibm.wala.cast.js.ipa.callgraph.J protected static JSCFABuilder makeCG(JavaScriptLoaderFactory loaders, AnalysisScope scope, CGBuilderType builderType, IRFactory irFactory) throws WalaException { try { IClassHierarchy cha = makeHierarchy(scope, loaders); - com.ibm.wala.cast.js.util.Util.checkForFrontEndErrors(cha); + com.ibm.wala.cast.util.Util.checkForFrontEndErrors(cha); Iterable roots = makeScriptRoots(cha); JSAnalysisOptions options = makeOptions(scope, cha, roots); options.setHandleCallApply(builderType.handleCallApply()); diff --git a/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/TestArgumentSensitivity.java b/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/TestArgumentSensitivity.java index 677e3371d..388601348 100644 --- a/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/TestArgumentSensitivity.java +++ b/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/TestArgumentSensitivity.java @@ -46,7 +46,7 @@ public abstract class TestArgumentSensitivity extends TestJSCallGraphShape { AnalysisScope scope = JSCallGraphBuilderUtil.makeScriptScope("tests", "args.js", loaders); IClassHierarchy cha = JSCallGraphUtil.makeHierarchy(scope, loaders); - com.ibm.wala.cast.js.util.Util.checkForFrontEndErrors(cha); + com.ibm.wala.cast.util.Util.checkForFrontEndErrors(cha); Iterable roots = JSCallGraphUtil.makeScriptRoots(cha); JSAnalysisOptions options = JSCallGraphUtil.makeOptions(scope, cha, roots); diff --git a/com.ibm.wala.cast.js/META-INF/MANIFEST.MF b/com.ibm.wala.cast.js/META-INF/MANIFEST.MF index b8198cba4..617cec77c 100644 --- a/com.ibm.wala.cast.js/META-INF/MANIFEST.MF +++ b/com.ibm.wala.cast.js/META-INF/MANIFEST.MF @@ -34,4 +34,4 @@ Require-Bundle: com.ibm.wala.cast, com.ibm.wala.cast, com.ibm.wala.shrike;bundle-version="1.1.3" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/CorrelationFinder.java b/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/CorrelationFinder.java index 9f3483d26..45c56bb79 100644 --- a/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/CorrelationFinder.java +++ b/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/CorrelationFinder.java @@ -35,7 +35,6 @@ import com.ibm.wala.cast.js.ipa.callgraph.JSCallGraphUtil; import com.ibm.wala.cast.js.loader.JavaScriptLoader; import com.ibm.wala.cast.js.loader.JavaScriptLoaderFactory; import com.ibm.wala.cast.js.translator.JavaScriptTranslatorFactory; -import com.ibm.wala.cast.js.util.Util; import com.ibm.wala.cast.loader.AstMethod; import com.ibm.wala.cast.loader.AstMethod.LexicalInformation; import com.ibm.wala.cast.tree.CAstSourcePositionMap.Position; @@ -287,7 +286,7 @@ public class CorrelationFinder { CAstAnalysisScope scope = new CAstAnalysisScope(scripts_array, loaders, Collections.singleton(JavaScriptLoader.JS)); IClassHierarchy cha = ClassHierarchyFactory.make(scope, loaders, JavaScriptLoader.JS); try { - Util.checkForFrontEndErrors(cha); + com.ibm.wala.cast.util.Util.checkForFrontEndErrors(cha); } catch (WalaException e) { return Collections.emptyMap(); } diff --git a/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/util/Util.java b/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/util/Util.java index 8a5a527bd..5b8ffd4a9 100644 --- a/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/util/Util.java +++ b/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/util/Util.java @@ -13,50 +13,17 @@ package com.ibm.wala.cast.js.util; import java.util.Iterator; import com.ibm.wala.cast.js.ssa.PrototypeLookup; -import com.ibm.wala.cast.loader.CAstAbstractLoader; -import com.ibm.wala.classLoader.IClassLoader; -import com.ibm.wala.classLoader.ModuleEntry; -import com.ibm.wala.ipa.cha.IClassHierarchy; import com.ibm.wala.ssa.DefUse; import com.ibm.wala.ssa.IR; import com.ibm.wala.ssa.SSAInstruction; import com.ibm.wala.ssa.SSAPhiInstruction; -import com.ibm.wala.util.WalaException; import com.ibm.wala.util.intset.IntSet; import com.ibm.wala.util.intset.IntSetAction; import com.ibm.wala.util.intset.IntSetUtil; import com.ibm.wala.util.intset.MutableIntSet; -import com.ibm.wala.util.warnings.Warning; public class Util { - public static void checkForFrontEndErrors(IClassHierarchy cha) throws WalaException { - StringBuffer message = null; - for(IClassLoader loader : cha.getLoaders()) { - if (loader instanceof CAstAbstractLoader) { - Iterator errors = ((CAstAbstractLoader)loader).getModulesWithParseErrors(); - if (errors.hasNext()) { - if (message == null) { - message = new StringBuffer("front end errors:\n"); - } - while (errors.hasNext()) { - ModuleEntry errorModule = errors.next(); - for(Warning w : (((CAstAbstractLoader)loader).getMessages(errorModule))) { - message.append("error in ").append(errorModule.getName()).append(":\n"); - message.append(w.toString()).append("\n"); - } - } - } - // clear out the errors to free some memory - ((CAstAbstractLoader)loader).clearMessages(); - } - } - if (message != null) { - message.append("end of front end errors\n"); - throw new WalaException(String.valueOf(message)); - } - } - public static IntSet getArgumentsArrayVns(IR ir, final DefUse du) { int originalArgsVn = getArgumentsArrayVn(ir); final MutableIntSet result = IntSetUtil.make(); diff --git a/com.ibm.wala.cast.test/META-INF/MANIFEST.MF b/com.ibm.wala.cast.test/META-INF/MANIFEST.MF index 1b58a5d52..74a498b1a 100644 --- a/com.ibm.wala.cast.test/META-INF/MANIFEST.MF +++ b/com.ibm.wala.cast.test/META-INF/MANIFEST.MF @@ -12,5 +12,5 @@ Require-Bundle: com.ibm.wala.shrike, org.eclipse.core.runtime Export-Package: com.ibm.wala.cast.test -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/com.ibm.wala.cast.test/harness-src/c/Makefile b/com.ibm.wala.cast.test/harness-src/c/Makefile index 37637deb9..121c44b86 100644 --- a/com.ibm.wala.cast.test/harness-src/c/Makefile +++ b/com.ibm.wala.cast.test/harness-src/c/Makefile @@ -16,7 +16,7 @@ CAST_OBJS = $(wildcard $(C_GENERATED)/*.o) default: $(CAST_TEST_BIN)$(LIBPREFIX)xlator_test.$(DLLEXT) $(TEST_JNI_BRIDGE_HEADER): $(CAST_TEST_BIN)com/ibm/wala/cast/test/TestNativeTranslator.class - $(JAVA_SDK)bin/javah -classpath "$(CAST_TEST_BIN)$(JAVAH_CLASS_PATH)" -d "$(JAVAH_GENERATED)" com.ibm.wala.cast.test.TestNativeTranslator + $(JAVA_HOME)bin/javah -classpath "$(CAST_TEST_BIN)$(JAVAH_CLASS_PATH)" -d "$(JAVAH_GENERATED)" com.ibm.wala.cast.test.TestNativeTranslator $(C_GENERATED)/smoke.o: $(TEST_JNI_BRIDGE_HEADER) smoke.cpp $(CC) $(ALL_FLAGS) -o $@ -c smoke.cpp diff --git a/com.ibm.wala.cast/META-INF/MANIFEST.MF b/com.ibm.wala.cast/META-INF/MANIFEST.MF index fc22ba7a0..7409198b8 100644 --- a/com.ibm.wala.cast/META-INF/MANIFEST.MF +++ b/com.ibm.wala.cast/META-INF/MANIFEST.MF @@ -28,5 +28,5 @@ Export-Package: com.ibm.wala.cast.analysis.typeInference, com.ibm.wala.cast.util, org.apache.commons.io, org.apache.commons.io.input -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/com.ibm.wala.cast/source/c/Makefile b/com.ibm.wala.cast/source/c/Makefile index 5471aa0bc..0e3500ab6 100644 --- a/com.ibm.wala.cast/source/c/Makefile +++ b/com.ibm.wala.cast/source/c/Makefile @@ -13,10 +13,10 @@ bindir: mkdir -p $(C_GENERATED) $(CAPA_JNI_BRIDGE_HEADER): $(DOMO_AST_BIN)com/ibm/wala/cast/ir/translator/NativeBridge.class bindir - $(JAVA_SDK)bin/javah -classpath "$(DOMO_AST_BIN)$(JAVAH_CLASS_PATH)" -d "$(JAVAH_GENERATED)" com.ibm.wala.cast.ir.translator.NativeBridge + $(JAVA_HOME)bin/javah -classpath "$(DOMO_AST_BIN)$(JAVAH_CLASS_PATH)" -d "$(JAVAH_GENERATED)" com.ibm.wala.cast.ir.translator.NativeBridge $(CAPA_JNI_XLATOR_HEADER): $(DOMO_AST_BIN)com/ibm/wala/cast/ir/translator/NativeTranslatorToCAst.class bindir - $(JAVA_SDK)bin/javah -classpath "$(DOMO_AST_BIN)$(JAVAH_CLASS_PATH)" -d "$(JAVAH_GENERATED)" com.ibm.wala.cast.ir.translator.NativeTranslatorToCAst + $(JAVA_HOME)bin/javah -classpath "$(DOMO_AST_BIN)$(JAVAH_CLASS_PATH)" -d "$(JAVAH_GENERATED)" com.ibm.wala.cast.ir.translator.NativeTranslatorToCAst $(CAPA_OBJECTS): $(C_GENERATED)%.o: %.cpp $(CAPA_JNI_HEADERS) bindir echo $(CAPA_OBJECTS) diff --git a/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/DelegatingAstPointerKeys.java b/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/DelegatingAstPointerKeys.java index 88e1aea03..138235f31 100644 --- a/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/DelegatingAstPointerKeys.java +++ b/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/DelegatingAstPointerKeys.java @@ -123,6 +123,6 @@ public class DelegatingAstPointerKeys implements AstPointerKeyFactory { return new NonNullSingletonIterator<>(ifk); } } - return new NonNullSingletonIterator(ReflectedFieldPointerKey.mapped(new ConcreteTypeKey(getFieldNameType(F)), I)); + return new NonNullSingletonIterator<>(ReflectedFieldPointerKey.mapped(new ConcreteTypeKey(getFieldNameType(F)), I)); } } diff --git a/com.ibm.wala.core.testdata/build.properties b/com.ibm.wala.core.testdata/build.properties index e92144e3e..b0a6c64f1 100644 --- a/com.ibm.wala.core.testdata/build.properties +++ b/com.ibm.wala.core.testdata/build.properties @@ -10,4 +10,4 @@ bin.includes = META-INF/,\ com.ibm.wala.core.testdata_1.0.0a.jar,\ OSGI-INF/l10n/bundle.properties,\ OSGI-INF/ - \ No newline at end of file + diff --git a/com.ibm.wala.core.tests/META-INF/MANIFEST.MF b/com.ibm.wala.core.tests/META-INF/MANIFEST.MF index fc002c708..c1d03fd98 100644 --- a/com.ibm.wala.core.tests/META-INF/MANIFEST.MF +++ b/com.ibm.wala.core.tests/META-INF/MANIFEST.MF @@ -35,7 +35,7 @@ Export-Package: com.ibm.wala.core.tests.arraybounds, com.ibm.wala.examples.drivers, com.ibm.wala.examples.properties, com.ibm.wala.util.io -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Bundle-Activator: com.ibm.wala.core.tests.plugin.CoreTestsPlugin Eclipse-RegisterBuddy: com.ibm.wala.core, com.ibm.wala.core.testdata diff --git a/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/dataflow/ContextInsensitiveReachingDefs.java b/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/dataflow/ContextInsensitiveReachingDefs.java index d65f7c701..0ab0fd40b 100644 --- a/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/dataflow/ContextInsensitiveReachingDefs.java +++ b/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/dataflow/ContextInsensitiveReachingDefs.java @@ -104,7 +104,7 @@ public class ContextInsensitiveReachingDefs { } } } - return new ObjectArrayMapping>(putInstrs.toArray(new Pair[putInstrs.size()])); + return new ObjectArrayMapping<>(putInstrs.toArray(new Pair[putInstrs.size()])); } private class TransferFunctions implements ITransferFunctionProvider, BitVectorVariable> { diff --git a/com.ibm.wala.core/META-INF/MANIFEST.MF b/com.ibm.wala.core/META-INF/MANIFEST.MF index bab7486ae..0ac5ecaaf 100644 --- a/com.ibm.wala.core/META-INF/MANIFEST.MF +++ b/com.ibm.wala.core/META-INF/MANIFEST.MF @@ -76,6 +76,6 @@ Export-Package: ., com.ibm.wala.viz, com.ibm.wala.viz.viewer, com.ibm.wala.viz.viewer.images -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Eclipse-BuddyPolicy: registered Bundle-ClassPath: . diff --git a/com.ibm.wala.core/src/com/ibm/wala/demandpa/alg/SimpleDemandPointsTo.java b/com.ibm.wala.core/src/com/ibm/wala/demandpa/alg/SimpleDemandPointsTo.java index 12eddfb51..1013b4877 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/demandpa/alg/SimpleDemandPointsTo.java +++ b/com.ibm.wala.core/src/com/ibm/wala/demandpa/alg/SimpleDemandPointsTo.java @@ -50,7 +50,7 @@ import com.ibm.wala.ipa.callgraph.propagation.InstanceKey; import com.ibm.wala.ipa.callgraph.propagation.LocalPointerKey; import com.ibm.wala.ipa.callgraph.propagation.PointerKey; import com.ibm.wala.ipa.cha.IClassHierarchy; -import com.ibm.wala.util.Predicate; +import com.ibm.wala.util.collections.HashSetFactory; import com.ibm.wala.util.debug.UnimplementedError; import com.ibm.wala.util.graph.traverse.SlowDFSDiscoverTimeIterator; @@ -70,7 +70,6 @@ public class SimpleDemandPointsTo extends AbstractDemandPointsTo { } @Override - @SuppressWarnings("unchecked") public Collection getPointsTo(PointerKey pk) throws IllegalArgumentException, UnimplementedError { if (pk == null) { @@ -93,15 +92,16 @@ public class SimpleDemandPointsTo extends AbstractDemandPointsTo { System.err.println(g.toString()); } - Predicate iKeyFilter = new Predicate() { - @Override - public boolean test(Object o) { - return o instanceof InstanceKey; - } - }; - SlowDFSDiscoverTimeIterator dfs = new SlowDFSDiscoverTimeIterator(g, pk); - return Predicate.filter(dfs, iKeyFilter); + Collection keys = HashSetFactory.make(); + while (dfs.hasNext()) { + Object o = dfs.next(); + if (o instanceof InstanceKey) { + keys.add((InstanceKey) o); + } + } + + return keys; } } diff --git a/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/Slicer.java b/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/Slicer.java index c714b4772..426ca3cf6 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/Slicer.java +++ b/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/Slicer.java @@ -302,7 +302,7 @@ public class Slicer { private final Collection roots; - private final ISupergraph> supergraph; + private final ISupergraph> supergraph; private final SliceFunctions f; diff --git a/com.ibm.wala.core/src/com/ibm/wala/types/TypeName.java b/com.ibm.wala.core/src/com/ibm/wala/types/TypeName.java index fe99d01cb..2e42e305a 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/types/TypeName.java +++ b/com.ibm.wala.core/src/com/ibm/wala/types/TypeName.java @@ -329,7 +329,7 @@ public final class TypeName implements Serializable { result.append("&"); break; default: - throw new UnsupportedOperationException(String.format("unexpected masked type-name component %X", masked)); + throw new UnsupportedOperationException("unexpected masked type-name component " + masked); } } } diff --git a/com.ibm.wala.dalvik.test/META-INF/MANIFEST.MF b/com.ibm.wala.dalvik.test/META-INF/MANIFEST.MF index e9253b8dc..9bd56c783 100644 --- a/com.ibm.wala.dalvik.test/META-INF/MANIFEST.MF +++ b/com.ibm.wala.dalvik.test/META-INF/MANIFEST.MF @@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.core.runtime, com.ibm.wala.shrike;bundle-version="1.3.4", org.junit;bundle-version="4.11.0" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ClassPath: ., lib/dx.jar Export-Package: com.ibm.wala.dalvik.drivers, diff --git a/com.ibm.wala.dalvik.test/build.properties b/com.ibm.wala.dalvik.test/build.properties index 5de0d97be..343bf8415 100644 --- a/com.ibm.wala.dalvik.test/build.properties +++ b/com.ibm.wala.dalvik.test/build.properties @@ -7,5 +7,5 @@ bin.includes = META-INF/,\ OSGI-INF/l10n/bundle.properties,\ OSGI-INF/ jars.extra.classpath = lib/dx.jar -jre.compilation.profile = JavaSE-1.7 +jre.compilation.profile = JavaSE-1.8 javacProjectSettings = true diff --git a/com.ibm.wala.dalvik/META-INF/MANIFEST.MF b/com.ibm.wala.dalvik/META-INF/MANIFEST.MF index 8ff3b81a8..6350e2c79 100644 --- a/com.ibm.wala.dalvik/META-INF/MANIFEST.MF +++ b/com.ibm.wala.dalvik/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 1.4.4.qualifier Require-Bundle: com.ibm.wala.core;bundle-version="1.1.3", com.ibm.wala.shrike;bundle-version="1.3.1", com.ibm.wala.cast;bundle-version="1.0.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Export-Package: com.google.common.annotations, com.google.common.base, diff --git a/com.ibm.wala.ide.jdt.test/META-INF/MANIFEST.MF b/com.ibm.wala.ide.jdt.test/META-INF/MANIFEST.MF index fe304a505..51c366ed7 100644 --- a/com.ibm.wala.ide.jdt.test/META-INF/MANIFEST.MF +++ b/com.ibm.wala.ide.jdt.test/META-INF/MANIFEST.MF @@ -28,7 +28,7 @@ Require-Bundle: com.ibm.wala.cast.java.test;bundle-version="1.0.0", org.eclipse.ant.launching, com.ibm.wala.cast.java.ecj Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: com.ibm.wala.cast.java.jdt.test, com.ibm.wala.cast.java.test, com.ibm.wala.demandpa.driver diff --git a/com.ibm.wala.ide.jdt.test/build.properties b/com.ibm.wala.ide.jdt.test/build.properties index 07ccc811a..1c3d4a8eb 100644 --- a/com.ibm.wala.ide.jdt.test/build.properties +++ b/com.ibm.wala.ide.jdt.test/build.properties @@ -5,5 +5,5 @@ bin.includes = META-INF/,\ .,\ OSGI-INF/l10n/bundle.properties,\ OSGI-INF/ -jre.compilation.profile = JavaSE-1.7 +jre.compilation.profile = JavaSE-1.8 javacProjectSettings = true diff --git a/com.ibm.wala.ide.jdt/META-INF/MANIFEST.MF b/com.ibm.wala.ide.jdt/META-INF/MANIFEST.MF index c34b23f9e..fd19b79ff 100644 --- a/com.ibm.wala.ide.jdt/META-INF/MANIFEST.MF +++ b/com.ibm.wala.ide.jdt/META-INF/MANIFEST.MF @@ -20,7 +20,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.jdt.launching, org.eclipse.jdt, com.ibm.wala.cast.java.ecj -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Export-Package: com.ibm.wala.cast.java.client, com.ibm.wala.cast.java.translator.jdt, diff --git a/com.ibm.wala.ide.jsdt.tests/META-INF/MANIFEST.MF b/com.ibm.wala.ide.jsdt.tests/META-INF/MANIFEST.MF index a4e38aa1d..342706a5f 100644 --- a/com.ibm.wala.ide.jsdt.tests/META-INF/MANIFEST.MF +++ b/com.ibm.wala.ide.jsdt.tests/META-INF/MANIFEST.MF @@ -23,5 +23,5 @@ Require-Bundle: com.ibm.wala.core;bundle-version="1.1.3", org.eclipse.ui.ide.application;bundle-version="1.0.501" Bundle-Activator: com.ibm.wala.ide.jsdt.tests.Activator Export-Package: com.ibm.wala.ide.jsdt.tests -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy diff --git a/com.ibm.wala.ide.jsdt/META-INF/MANIFEST.MF b/com.ibm.wala.ide.jsdt/META-INF/MANIFEST.MF index 03ff05a0f..54051f85a 100644 --- a/com.ibm.wala.ide.jsdt/META-INF/MANIFEST.MF +++ b/com.ibm.wala.ide.jsdt/META-INF/MANIFEST.MF @@ -20,7 +20,7 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.ui.ide;bundle-version="3.8.2", org.eclipse.pde;bundle-version="3.8.0", org.eclipse.pde.core;bundle-version="3.8.1" -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Import-Package: org.eclipse.wst.jsdt.internal.corext.callhierarchy Export-Package: com.ibm.wala.cast.js.client, diff --git a/com.ibm.wala.ide.tests/META-INF/MANIFEST.MF b/com.ibm.wala.ide.tests/META-INF/MANIFEST.MF index 9c4ef3eec..707b5d0b4 100644 --- a/com.ibm.wala.ide.tests/META-INF/MANIFEST.MF +++ b/com.ibm.wala.ide.tests/META-INF/MANIFEST.MF @@ -19,7 +19,7 @@ Require-Bundle: com.ibm.wala.shrike, org.eclipse.e4.core.di;bundle-version="1.2.0";resolution:=optional, org.junit;bundle-version="4.0.0" Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Export-Package: com.ibm.wala.examples.drivers, com.ibm.wala.ide.test, diff --git a/com.ibm.wala.ide/META-INF/MANIFEST.MF b/com.ibm.wala.ide/META-INF/MANIFEST.MF index 8984b75bc..8b622f71a 100644 --- a/com.ibm.wala.ide/META-INF/MANIFEST.MF +++ b/com.ibm.wala.ide/META-INF/MANIFEST.MF @@ -20,7 +20,7 @@ Require-Bundle: com.ibm.wala.core, org.eclipse.jdt.launching, org.eclipse.e4.ui.workbench;bundle-version="1.2.2";resolution:=optional Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: com.ibm.wala.ide.classloader, com.ibm.wala.ide.client, com.ibm.wala.ide.plugin, diff --git a/com.ibm.wala.scandroid/META-INF/MANIFEST.MF b/com.ibm.wala.scandroid/META-INF/MANIFEST.MF index d1403c547..e4bd2f3ac 100644 --- a/com.ibm.wala.scandroid/META-INF/MANIFEST.MF +++ b/com.ibm.wala.scandroid/META-INF/MANIFEST.MF @@ -7,5 +7,5 @@ Bundle-Vendor: %Bundle-Vendor Require-Bundle: com.ibm.wala.dalvik;bundle-version="1.3.4", com.ibm.wala.core;bundle-version="1.3.4", com.ibm.wala.shrike;bundle-version="1.3.4" -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy diff --git a/com.ibm.wala.shrike/META-INF/MANIFEST.MF b/com.ibm.wala.shrike/META-INF/MANIFEST.MF index e71657dcb..0d78ba177 100644 --- a/com.ibm.wala.shrike/META-INF/MANIFEST.MF +++ b/com.ibm.wala.shrike/META-INF/MANIFEST.MF @@ -18,5 +18,5 @@ Export-Package: com.ibm.wala.shrike.bench, com.ibm.wala.shrikeBT.tools, com.ibm.wala.shrikeCT, com.ibm.wala.sourcepos -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: com.ibm.wala.util diff --git a/com.ibm.wala.util/META-INF/MANIFEST.MF b/com.ibm.wala.util/META-INF/MANIFEST.MF index c769731b5..b0f4baf5f 100644 --- a/com.ibm.wala.util/META-INF/MANIFEST.MF +++ b/com.ibm.wala.util/META-INF/MANIFEST.MF @@ -25,4 +25,4 @@ Export-Package: com.ibm.wala.dataflow.graph, com.ibm.wala.util.tables, com.ibm.wala.viz Bundle-Vendor: %Bundle-Vendor -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/pom.xml b/pom.xml index 0c14ef18f..5d543b5d8 100644 --- a/pom.xml +++ b/pom.xml @@ -116,6 +116,7 @@ tycho-compiler-plugin ${tycho-version} + jdt true diff --git a/targets/e47/e47.target b/targets/e47/e47.target index 5bfa08b89..2ba37475c 100644 --- a/targets/e47/e47.target +++ b/targets/e47/e47.target @@ -1,5 +1,5 @@ - +