From 71965a734e61c4a3d8d31ae81c0d80e971ce4af7 Mon Sep 17 00:00:00 2001 From: Lukas Subel Date: Wed, 27 May 2015 12:39:52 +0200 Subject: [PATCH 01/10] Fixed listEntry s.t. files used in tests are accessable --- .../com.ibm.wala.cast.js.test-JUnit.launch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/com.ibm.wala.cast.js.test/.launchConfigurations/com.ibm.wala.cast.js.test-JUnit.launch b/com.ibm.wala.cast.js.test/.launchConfigurations/com.ibm.wala.cast.js.test-JUnit.launch index 54076bc2f..98dbca14b 100755 --- a/com.ibm.wala.cast.js.test/.launchConfigurations/com.ibm.wala.cast.js.test-JUnit.launch +++ b/com.ibm.wala.cast.js.test/.launchConfigurations/com.ibm.wala.cast.js.test-JUnit.launch @@ -14,7 +14,7 @@ - + From 975bc8011c0c3d70f26857bafee44f718823f6cd Mon Sep 17 00:00:00 2001 From: Julian Dolby Date: Sat, 30 May 2015 11:25:16 -0400 Subject: [PATCH 02/10] more attempts to make test run on maven --- com.ibm.wala.ide.jsdt.tests/META-INF/MANIFEST.MF | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 c9b3a5993..e9591f331 100644 --- a/com.ibm.wala.ide.jsdt.tests/META-INF/MANIFEST.MF +++ b/com.ibm.wala.ide.jsdt.tests/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: JSDT Tests -Bundle-SymbolicName: com.ibm.wala.ide.jsdt.tests +Bundle-SymbolicName: com.ibm.wala.ide.jsdt.tests;singleton:=true Bundle-Version: 1.3.4.qualifier Require-Bundle: com.ibm.wala.core;bundle-version="1.1.3", com.ibm.wala.cast;bundle-version="1.0.0", @@ -24,3 +24,4 @@ Require-Bundle: com.ibm.wala.core;bundle-version="1.1.3", Bundle-Activator: com.ibm.wala.ide.jsdt.tests.Activator Export-Package: com.ibm.wala.ide.jsdt.tests Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Bundle-ActivationPolicy: lazy From 052023581d17ee73735438943f42563082861051 Mon Sep 17 00:00:00 2001 From: Manu Sridharan Date: Sun, 31 May 2015 13:53:07 -0700 Subject: [PATCH 03/10] update version to 1.3.8-SNAPSHOT --- com.ibm.wala-feature/feature.xml | 2 +- com.ibm.wala-feature/pom.xml | 2 +- com.ibm.wala-repository/pom.xml | 2 +- com.ibm.wala.cast.java.polyglot.test/META-INF/MANIFEST.MF | 2 +- com.ibm.wala.cast.java.polyglot.test/pom.xml | 2 +- com.ibm.wala.cast.java.polyglot/META-INF/MANIFEST.MF | 2 +- com.ibm.wala.cast.java.polyglot/pom.xml | 2 +- com.ibm.wala.cast.java.test.data/META-INF/MANIFEST.MF | 2 +- com.ibm.wala.cast.java.test.data/pom.xml | 2 +- com.ibm.wala.cast.java.test/META-INF/MANIFEST.MF | 2 +- com.ibm.wala.cast.java.test/pom.xml | 2 +- com.ibm.wala.cast.java/META-INF/MANIFEST.MF | 2 +- com.ibm.wala.cast.java/pom.xml | 2 +- com.ibm.wala.cast.js.html.nu_validator/META-INF/MANIFEST.MF | 2 +- com.ibm.wala.cast.js.html.nu_validator/pom.xml | 2 +- com.ibm.wala.cast.js.rhino.test/META-INF/MANIFEST.MF | 2 +- com.ibm.wala.cast.js.rhino.test/pom.xml | 2 +- com.ibm.wala.cast.js.rhino/META-INF/MANIFEST.MF | 2 +- com.ibm.wala.cast.js.rhino/pom.xml | 2 +- com.ibm.wala.cast.js.test.data/META-INF/MANIFEST.MF | 2 +- com.ibm.wala.cast.js.test.data/pom.xml | 2 +- com.ibm.wala.cast.js.test/META-INF/MANIFEST.MF | 2 +- com.ibm.wala.cast.js.test/pom.xml | 2 +- com.ibm.wala.cast.js/META-INF/MANIFEST.MF | 2 +- com.ibm.wala.cast.js/pom.xml | 2 +- com.ibm.wala.cast.test/META-INF/MANIFEST.MF | 2 +- com.ibm.wala.cast.test/pom.xml | 2 +- com.ibm.wala.cast/META-INF/MANIFEST.MF | 2 +- com.ibm.wala.cast/pom.xml | 2 +- com.ibm.wala.core.testdata/META-INF/MANIFEST.MF | 2 +- com.ibm.wala.core.testdata/pom.xml | 2 +- com.ibm.wala.core.tests/META-INF/MANIFEST.MF | 2 +- com.ibm.wala.core.tests/pom.xml | 2 +- com.ibm.wala.core/META-INF/MANIFEST.MF | 2 +- com.ibm.wala.core/mvncentral.xml | 6 +++--- com.ibm.wala.core/pom.xml | 2 +- com.ibm.wala.dalvik.test/META-INF/MANIFEST.MF | 2 +- com.ibm.wala.dalvik.test/pom.xml | 2 +- com.ibm.wala.dalvik/META-INF/MANIFEST.MF | 2 +- com.ibm.wala.dalvik/pom.xml | 2 +- com.ibm.wala.ide-feature/feature.xml | 2 +- com.ibm.wala.ide-feature/pom.xml | 2 +- com.ibm.wala.ide.jdt.test/META-INF/MANIFEST.MF | 2 +- com.ibm.wala.ide.jdt.test/pom.xml | 2 +- com.ibm.wala.ide.jdt/META-INF/MANIFEST.MF | 2 +- com.ibm.wala.ide.jdt/pom.xml | 2 +- com.ibm.wala.ide.jsdt.tests/META-INF/MANIFEST.MF | 2 +- com.ibm.wala.ide.jsdt.tests/pom.xml | 2 +- com.ibm.wala.ide.jsdt/META-INF/MANIFEST.MF | 2 +- com.ibm.wala.ide.jsdt/pom.xml | 2 +- com.ibm.wala.ide.tests/META-INF/MANIFEST.MF | 2 +- com.ibm.wala.ide.tests/pom.xml | 2 +- com.ibm.wala.ide/META-INF/MANIFEST.MF | 2 +- com.ibm.wala.ide/pom.xml | 2 +- com.ibm.wala.scandroid/META-INF/MANIFEST.MF | 2 +- com.ibm.wala.scandroid/pom.xml | 2 +- com.ibm.wala.shrike/META-INF/MANIFEST.MF | 2 +- com.ibm.wala.shrike/mvncentral.xml | 4 ++-- com.ibm.wala.shrike/pom.xml | 2 +- com.ibm.wala.tests-feature/feature.xml | 2 +- com.ibm.wala.tests-feature/pom.xml | 2 +- com.ibm.wala.tests.ide-feature/feature.xml | 2 +- com.ibm.wala.util/META-INF/MANIFEST.MF | 2 +- com.ibm.wala.util/mvncentral.xml | 2 +- com.ibm.wala.util/pom.xml | 2 +- pom.xml | 4 ++-- targets/e42/pom.xml | 2 +- targets/e44/pom.xml | 2 +- targets/pom.xml | 2 +- 69 files changed, 73 insertions(+), 73 deletions(-) diff --git a/com.ibm.wala-feature/feature.xml b/com.ibm.wala-feature/feature.xml index 12344504b..3e42d90f3 100644 --- a/com.ibm.wala-feature/feature.xml +++ b/com.ibm.wala-feature/feature.xml @@ -2,7 +2,7 @@ WALA com.ibm.wala - 1.3.7 + 1.3.8-SNAPSHOT com.ibm.wala-feature eclipse-feature diff --git a/com.ibm.wala-repository/pom.xml b/com.ibm.wala-repository/pom.xml index e4779c17c..3a450fd5b 100644 --- a/com.ibm.wala-repository/pom.xml +++ b/com.ibm.wala-repository/pom.xml @@ -5,7 +5,7 @@ com.ibm.wala WALA - 1.3.7 + 1.3.8-SNAPSHOT com.ibm.wala-repository eclipse-repository diff --git a/com.ibm.wala.cast.java.polyglot.test/META-INF/MANIFEST.MF b/com.ibm.wala.cast.java.polyglot.test/META-INF/MANIFEST.MF index 6d2a5ca53..668541d2d 100644 --- a/com.ibm.wala.cast.java.polyglot.test/META-INF/MANIFEST.MF +++ b/com.ibm.wala.cast.java.polyglot.test/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: WALA Cast Java Polyglot Test Plug-in Bundle-SymbolicName: com.ibm.wala.cast.java.polyglot.test -Bundle-Version: 1.3.7 +Bundle-Version: 1.3.8.qualifier Bundle-Activator: com.ibm.wala.cast.java.polyglot.test.Activator Bundle-Vendor: IBM Require-Bundle: com.ibm.wala.cast;bundle-version="1.0.0", diff --git a/com.ibm.wala.cast.java.polyglot.test/pom.xml b/com.ibm.wala.cast.java.polyglot.test/pom.xml index b825259bc..e1ed710ea 100644 --- a/com.ibm.wala.cast.java.polyglot.test/pom.xml +++ b/com.ibm.wala.cast.java.polyglot.test/pom.xml @@ -5,7 +5,7 @@ com.ibm.wala WALA - 1.3.7 + 1.3.8-SNAPSHOT com.ibm.wala.cast.java.polyglot.test eclipse-plugin diff --git a/com.ibm.wala.cast.java.polyglot/META-INF/MANIFEST.MF b/com.ibm.wala.cast.java.polyglot/META-INF/MANIFEST.MF index 5e650c42e..f83d153fe 100644 --- a/com.ibm.wala.cast.java.polyglot/META-INF/MANIFEST.MF +++ b/com.ibm.wala.cast.java.polyglot/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: WALA CAst Java Polyglot Plug-in Bundle-SymbolicName: com.ibm.wala.cast.java.polyglot -Bundle-Version: 1.3.7 +Bundle-Version: 1.3.8.qualifier Bundle-Vendor: IBM Require-Bundle: com.ibm.wala.cast.java, com.ibm.wala.cast, diff --git a/com.ibm.wala.cast.java.polyglot/pom.xml b/com.ibm.wala.cast.java.polyglot/pom.xml index 93af5ad6a..b9ee18201 100644 --- a/com.ibm.wala.cast.java.polyglot/pom.xml +++ b/com.ibm.wala.cast.java.polyglot/pom.xml @@ -6,7 +6,7 @@ WALA com.ibm.wala - 1.3.7 + 1.3.8-SNAPSHOT com.ibm.wala.cast.java.polyglot eclipse-plugin 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 9d9d6acac..8362d97fb 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 @@ -2,6 +2,6 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Data Plug-in Bundle-SymbolicName: com.ibm.wala.cast.java.test.data -Bundle-Version: 1.3.7 +Bundle-Version: 1.3.8.qualifier Bundle-Vendor: IBM Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/com.ibm.wala.cast.java.test.data/pom.xml b/com.ibm.wala.cast.java.test.data/pom.xml index 287cc0380..d8d037788 100644 --- a/com.ibm.wala.cast.java.test.data/pom.xml +++ b/com.ibm.wala.cast.java.test.data/pom.xml @@ -5,7 +5,7 @@ com.ibm.wala WALA - 1.3.7 + 1.3.8-SNAPSHOT com.ibm.wala.cast.java.test.data eclipse-plugin 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 eaebebe10..44b96f951 100644 --- a/com.ibm.wala.cast.java.test/META-INF/MANIFEST.MF +++ b/com.ibm.wala.cast.java.test/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Java AST WALA Test Plug-in Bundle-SymbolicName: com.ibm.wala.cast.java.test -Bundle-Version: 1.3.7 +Bundle-Version: 1.3.8.qualifier Bundle-Activator: com.ibm.wala.cast.java.test.TestPlugin Bundle-Vendor: IBM Require-Bundle: com.ibm.wala.core.tests, diff --git a/com.ibm.wala.cast.java.test/pom.xml b/com.ibm.wala.cast.java.test/pom.xml index 03192b56d..723c2cbc8 100644 --- a/com.ibm.wala.cast.java.test/pom.xml +++ b/com.ibm.wala.cast.java.test/pom.xml @@ -5,7 +5,7 @@ com.ibm.wala WALA - 1.3.7 + 1.3.8-SNAPSHOT com.ibm.wala.cast.java.test eclipse-plugin diff --git a/com.ibm.wala.cast.java/META-INF/MANIFEST.MF b/com.ibm.wala.cast.java/META-INF/MANIFEST.MF index 73e4cf4e2..7c6f33172 100644 --- a/com.ibm.wala.cast.java/META-INF/MANIFEST.MF +++ b/com.ibm.wala.cast.java/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Java Source WALA Front End Bundle-SymbolicName: com.ibm.wala.cast.java -Bundle-Version: 1.3.7 +Bundle-Version: 1.3.8.qualifier Bundle-Activator: com.ibm.wala.cast.java.JavaSourcePlugin Bundle-Vendor: rfuhrer@watson.ibm.com Require-Bundle: com.ibm.wala.cast, diff --git a/com.ibm.wala.cast.java/pom.xml b/com.ibm.wala.cast.java/pom.xml index ea9399b48..11ed04a42 100644 --- a/com.ibm.wala.cast.java/pom.xml +++ b/com.ibm.wala.cast.java/pom.xml @@ -5,7 +5,7 @@ WALA com.ibm.wala - 1.3.7 + 1.3.8-SNAPSHOT com.ibm.wala.cast.java eclipse-plugin 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 cf8e40dca..895ab2244 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 @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Nu_validator Bundle-SymbolicName: com.ibm.wala.cast.js.html.nu_validator -Bundle-Version: 1.3.7 +Bundle-Version: 1.3.8.qualifier Export-Package: com.ibm.wala.cast.js.html.nu_validator Require-Bundle: com.ibm.wala.cast.js;bundle-version="1.0.0", com.ibm.wala.cast.js.rhino.test;bundle-version="1.0.0", diff --git a/com.ibm.wala.cast.js.html.nu_validator/pom.xml b/com.ibm.wala.cast.js.html.nu_validator/pom.xml index 7de3bc827..4691adf2b 100644 --- a/com.ibm.wala.cast.js.html.nu_validator/pom.xml +++ b/com.ibm.wala.cast.js.html.nu_validator/pom.xml @@ -5,7 +5,7 @@ WALA com.ibm.wala - 1.3.7 + 1.3.8-SNAPSHOT com.ibm.wala.cast.js.html.nu_validator eclipse-plugin 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 fb993268d..06b9dd290 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 @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Test Plug-in Bundle-SymbolicName: com.ibm.wala.cast.js.rhino.test -Bundle-Version: 1.3.7 +Bundle-Version: 1.3.8.qualifier Bundle-Vendor: IBM Require-Bundle: com.ibm.wala.cast.js.rhino;bundle-version="1.0.0", com.ibm.wala.cast.js;bundle-version="1.0.0", diff --git a/com.ibm.wala.cast.js.rhino.test/pom.xml b/com.ibm.wala.cast.js.rhino.test/pom.xml index a70000033..db1017965 100644 --- a/com.ibm.wala.cast.js.rhino.test/pom.xml +++ b/com.ibm.wala.cast.js.rhino.test/pom.xml @@ -5,7 +5,7 @@ com.ibm.wala WALA - 1.3.7 + 1.3.8-SNAPSHOT com.ibm.wala.cast.js.rhino.test eclipse-plugin 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 ff3f6234e..33566028a 100644 --- a/com.ibm.wala.cast.js.rhino/META-INF/MANIFEST.MF +++ b/com.ibm.wala.cast.js.rhino/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Rhino Plug-in Bundle-SymbolicName: com.ibm.wala.cast.js.rhino -Bundle-Version: 1.3.7 +Bundle-Version: 1.3.8.qualifier Bundle-Activator: com.ibm.wala.js.rhino.Activator Bundle-Vendor: IBM Require-Bundle: org.eclipse.core.runtime, diff --git a/com.ibm.wala.cast.js.rhino/pom.xml b/com.ibm.wala.cast.js.rhino/pom.xml index 761a5e882..9f97c9c9c 100644 --- a/com.ibm.wala.cast.js.rhino/pom.xml +++ b/com.ibm.wala.cast.js.rhino/pom.xml @@ -6,7 +6,7 @@ WALA com.ibm.wala - 1.3.7 + 1.3.8-SNAPSHOT com.ibm.wala.cast.js.rhino eclipse-plugin 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 550b0ab75..7c0880a1e 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 @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Eclipse-LazyStart: true Bundle-Name: %pluginName Bundle-SymbolicName: com.ibm.wala.cast.js.test.data;singleton:=true -Bundle-Version: 1.3.7 +Bundle-Version: 1.3.8.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-ActivationPolicy: lazy diff --git a/com.ibm.wala.cast.js.test.data/pom.xml b/com.ibm.wala.cast.js.test.data/pom.xml index c2fd04c99..91fe4acb7 100644 --- a/com.ibm.wala.cast.js.test.data/pom.xml +++ b/com.ibm.wala.cast.js.test.data/pom.xml @@ -5,7 +5,7 @@ com.ibm.wala WALA - 1.3.7 + 1.3.8-SNAPSHOT com.ibm.wala.cast.js.test.data eclipse-plugin 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 08dd10522..fe605df41 100755 --- a/com.ibm.wala.cast.js.test/META-INF/MANIFEST.MF +++ b/com.ibm.wala.cast.js.test/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: WALA JavaScript Test Plug-in Bundle-SymbolicName: com.ibm.wala.cast.js.test;singleton:=true -Bundle-Version: 1.3.7 +Bundle-Version: 1.3.8.qualifier Bundle-ClassPath: test.jar Bundle-Vendor: IBM Require-Bundle: com.ibm.wala.cast.js, diff --git a/com.ibm.wala.cast.js.test/pom.xml b/com.ibm.wala.cast.js.test/pom.xml index c8ec3bbaa..9d2c9c287 100644 --- a/com.ibm.wala.cast.js.test/pom.xml +++ b/com.ibm.wala.cast.js.test/pom.xml @@ -5,7 +5,7 @@ com.ibm.wala WALA - 1.3.7 + 1.3.8-SNAPSHOT com.ibm.wala.cast.js.test eclipse-plugin diff --git a/com.ibm.wala.cast.js/META-INF/MANIFEST.MF b/com.ibm.wala.cast.js/META-INF/MANIFEST.MF index 750568c7e..7a3aa5796 100644 --- a/com.ibm.wala.cast.js/META-INF/MANIFEST.MF +++ b/com.ibm.wala.cast.js/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: JavaScript Plug-in Bundle-SymbolicName: com.ibm.wala.cast.js;singleton:=true -Bundle-Version: 1.3.7 +Bundle-Version: 1.3.8.qualifier Bundle-ClassPath: ., lib/jericho-html-3.2.jar Bundle-Activator: com.ibm.wala.cast.js.JavaScriptPlugin diff --git a/com.ibm.wala.cast.js/pom.xml b/com.ibm.wala.cast.js/pom.xml index cacd4b0bf..e467b0c39 100644 --- a/com.ibm.wala.cast.js/pom.xml +++ b/com.ibm.wala.cast.js/pom.xml @@ -6,7 +6,7 @@ WALA com.ibm.wala - 1.3.7 + 1.3.8-SNAPSHOT com.ibm.wala com.ibm.wala.cast.js diff --git a/com.ibm.wala.cast.test/META-INF/MANIFEST.MF b/com.ibm.wala.cast.test/META-INF/MANIFEST.MF index 5e8999555..e8f8b0d80 100644 --- a/com.ibm.wala.cast.test/META-INF/MANIFEST.MF +++ b/com.ibm.wala.cast.test/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: CAst Test Plug-in Bundle-SymbolicName: com.ibm.wala.cast.test -Bundle-Version: 1.3.7 +Bundle-Version: 1.3.8.qualifier Bundle-Vendor: IBM Require-Bundle: org.junit;bundle-version="4.0.0", diff --git a/com.ibm.wala.cast.test/pom.xml b/com.ibm.wala.cast.test/pom.xml index 0a4ca49f8..21040e456 100644 --- a/com.ibm.wala.cast.test/pom.xml +++ b/com.ibm.wala.cast.test/pom.xml @@ -5,7 +5,7 @@ com.ibm.wala WALA - 1.3.7 + 1.3.8-SNAPSHOT com.ibm.wala.cast.test eclipse-plugin diff --git a/com.ibm.wala.cast/META-INF/MANIFEST.MF b/com.ibm.wala.cast/META-INF/MANIFEST.MF index a56d5ec73..b6426275e 100644 --- a/com.ibm.wala.cast/META-INF/MANIFEST.MF +++ b/com.ibm.wala.cast/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: WALA CAst core Plug-in Bundle-SymbolicName: com.ibm.wala.cast -Bundle-Version: 1.3.7 +Bundle-Version: 1.3.8.qualifier Bundle-Activator: com.ibm.wala.cast.plugin.AstPlugin Bundle-Vendor: IBM Require-Bundle: com.ibm.wala.core, diff --git a/com.ibm.wala.cast/pom.xml b/com.ibm.wala.cast/pom.xml index 76a1ace18..ccfc2a902 100644 --- a/com.ibm.wala.cast/pom.xml +++ b/com.ibm.wala.cast/pom.xml @@ -5,7 +5,7 @@ WALA com.ibm.wala - 1.3.7 + 1.3.8-SNAPSHOT com.ibm.wala.cast eclipse-plugin diff --git a/com.ibm.wala.core.testdata/META-INF/MANIFEST.MF b/com.ibm.wala.core.testdata/META-INF/MANIFEST.MF index d08489c0d..ab1d57c9c 100644 --- a/com.ibm.wala.core.testdata/META-INF/MANIFEST.MF +++ b/com.ibm.wala.core.testdata/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Testdata Plug-in Bundle-SymbolicName: com.ibm.wala.core.testdata -Bundle-Version: 1.3.7 +Bundle-Version: 1.3.8.qualifier Bundle-Vendor: IBM Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Eclipse-BuddyPolicy: registered diff --git a/com.ibm.wala.core.testdata/pom.xml b/com.ibm.wala.core.testdata/pom.xml index 7cc852816..1987688a8 100644 --- a/com.ibm.wala.core.testdata/pom.xml +++ b/com.ibm.wala.core.testdata/pom.xml @@ -5,7 +5,7 @@ com.ibm.wala WALA - 1.3.7 + 1.3.8-SNAPSHOT com.ibm.wala.core.testdata eclipse-plugin diff --git a/com.ibm.wala.core.tests/META-INF/MANIFEST.MF b/com.ibm.wala.core.tests/META-INF/MANIFEST.MF index 778c62f83..f6d5d1e99 100644 --- a/com.ibm.wala.core.tests/META-INF/MANIFEST.MF +++ b/com.ibm.wala.core.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: com.ibm.wala.core.tests;singleton:=true -Bundle-Version: 1.3.7 +Bundle-Version: 1.3.8.qualifier Bundle-Vendor: %providerName Require-Bundle: com.ibm.wala.shrike, com.ibm.wala.core, diff --git a/com.ibm.wala.core.tests/pom.xml b/com.ibm.wala.core.tests/pom.xml index 0318fef67..fe359214a 100644 --- a/com.ibm.wala.core.tests/pom.xml +++ b/com.ibm.wala.core.tests/pom.xml @@ -5,7 +5,7 @@ com.ibm.wala WALA - 1.3.7 + 1.3.8-SNAPSHOT com.ibm.wala.core.tests eclipse-plugin diff --git a/com.ibm.wala.core/META-INF/MANIFEST.MF b/com.ibm.wala.core/META-INF/MANIFEST.MF index 0bc8b0012..54ee2c7fd 100644 --- a/com.ibm.wala.core/META-INF/MANIFEST.MF +++ b/com.ibm.wala.core/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Eclipse-LazyStart: true Bundle-Name: %pluginName Bundle-SymbolicName: com.ibm.wala.core -Bundle-Version: 1.3.7 +Bundle-Version: 1.3.8.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Require-Bundle: com.ibm.wala.shrike, diff --git a/com.ibm.wala.core/mvncentral.xml b/com.ibm.wala.core/mvncentral.xml index 0a47b56f9..25bdccc9c 100644 --- a/com.ibm.wala.core/mvncentral.xml +++ b/com.ibm.wala.core/mvncentral.xml @@ -5,7 +5,7 @@ 4.0.0 com.ibm.wala com.ibm.wala.core - 1.3.7 + 1.3.8-SNAPSHOT jar WALA Core Core WALA analysis libraries @@ -45,12 +45,12 @@ com.ibm.wala com.ibm.wala.util - 1.3.7 + 1.3.8-SNAPSHOT com.ibm.wala com.ibm.wala.shrike - 1.3.7 + 1.3.8-SNAPSHOT diff --git a/com.ibm.wala.core/pom.xml b/com.ibm.wala.core/pom.xml index 8637b829e..259954a8f 100644 --- a/com.ibm.wala.core/pom.xml +++ b/com.ibm.wala.core/pom.xml @@ -5,7 +5,7 @@ WALA com.ibm.wala - 1.3.7 + 1.3.8-SNAPSHOT com.ibm.wala.core eclipse-plugin diff --git a/com.ibm.wala.dalvik.test/META-INF/MANIFEST.MF b/com.ibm.wala.dalvik.test/META-INF/MANIFEST.MF index b809d11c3..201532489 100644 --- a/com.ibm.wala.dalvik.test/META-INF/MANIFEST.MF +++ b/com.ibm.wala.dalvik.test/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: WalaDalvikBytecodeTests Bundle-SymbolicName: com.ibm.wala.dalvik.test -Bundle-Version: 1.3.7 +Bundle-Version: 1.3.8.qualifier Bundle-Activator: com.ibm.wala.dalvik.test.Activator Bundle-Vendor: IBM Require-Bundle: org.eclipse.core.runtime, diff --git a/com.ibm.wala.dalvik.test/pom.xml b/com.ibm.wala.dalvik.test/pom.xml index f04f07d92..486c7c7d4 100644 --- a/com.ibm.wala.dalvik.test/pom.xml +++ b/com.ibm.wala.dalvik.test/pom.xml @@ -5,7 +5,7 @@ com.ibm.wala WALA - 1.3.7 + 1.3.8-SNAPSHOT com.ibm.wala.dalvik.test eclipse-plugin diff --git a/com.ibm.wala.dalvik/META-INF/MANIFEST.MF b/com.ibm.wala.dalvik/META-INF/MANIFEST.MF index 379ad4b8e..b57ef0242 100644 --- a/com.ibm.wala.dalvik/META-INF/MANIFEST.MF +++ b/com.ibm.wala.dalvik/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: WALA Dalvik Bytecode Frontend Bundle-SymbolicName: com.ibm.wala.dalvik -Bundle-Version: 1.3.7 +Bundle-Version: 1.3.8.qualifier Require-Bundle: com.ibm.wala.cast;bundle-version="1.0.0", com.ibm.wala.core;bundle-version="1.1.3", com.ibm.wala.ide;bundle-version="1.1.3", diff --git a/com.ibm.wala.dalvik/pom.xml b/com.ibm.wala.dalvik/pom.xml index ec3e1683b..159311940 100644 --- a/com.ibm.wala.dalvik/pom.xml +++ b/com.ibm.wala.dalvik/pom.xml @@ -6,7 +6,7 @@ WALA com.ibm.wala - 1.3.7 + 1.3.8-SNAPSHOT com.ibm.wala.dalvik eclipse-plugin diff --git a/com.ibm.wala.ide-feature/feature.xml b/com.ibm.wala.ide-feature/feature.xml index 484827d42..eedfa4ec4 100644 --- a/com.ibm.wala.ide-feature/feature.xml +++ b/com.ibm.wala.ide-feature/feature.xml @@ -2,7 +2,7 @@ WALA com.ibm.wala - 1.3.7 + 1.3.8-SNAPSHOT com.ibm.wala.ide-feature eclipse-feature 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 f50321703..2f7b9337f 100644 --- a/com.ibm.wala.ide.jdt.test/META-INF/MANIFEST.MF +++ b/com.ibm.wala.ide.jdt.test/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: WALA CAst Java JDT Test Plug-in Bundle-SymbolicName: com.ibm.wala.ide.jdt.test -Bundle-Version: 1.3.7 +Bundle-Version: 1.3.8.qualifier Bundle-Activator: com.ibm.wala.cast.java.jdt.test.Activator Bundle-Vendor: IBM Require-Bundle: com.ibm.wala.cast.java.test;bundle-version="1.0.0", diff --git a/com.ibm.wala.ide.jdt.test/pom.xml b/com.ibm.wala.ide.jdt.test/pom.xml index ef816b5a5..5ba034ef4 100644 --- a/com.ibm.wala.ide.jdt.test/pom.xml +++ b/com.ibm.wala.ide.jdt.test/pom.xml @@ -6,7 +6,7 @@ WALA com.ibm.wala - 1.3.7 + 1.3.8-SNAPSHOT diff --git a/com.ibm.wala.ide.jdt/META-INF/MANIFEST.MF b/com.ibm.wala.ide.jdt/META-INF/MANIFEST.MF index 71c98ac2f..feb768de1 100644 --- a/com.ibm.wala.ide.jdt/META-INF/MANIFEST.MF +++ b/com.ibm.wala.ide.jdt/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: WALA IDE JDT components Bundle-SymbolicName: com.ibm.wala.ide.jdt -Bundle-Version: 1.3.7 +Bundle-Version: 1.3.8.qualifier Bundle-Activator: com.ibm.wala.ide.jdt.Activator Bundle-Vendor: IBM Require-Bundle: org.eclipse.ui, diff --git a/com.ibm.wala.ide.jdt/pom.xml b/com.ibm.wala.ide.jdt/pom.xml index 4b7e70d70..8b4049ab5 100644 --- a/com.ibm.wala.ide.jdt/pom.xml +++ b/com.ibm.wala.ide.jdt/pom.xml @@ -5,7 +5,7 @@ WALA com.ibm.wala - 1.3.7 + 1.3.8-SNAPSHOT com.ibm.wala.ide.jdt eclipse-plugin 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 039ded329..2528b0982 100644 --- a/com.ibm.wala.ide.jsdt.tests/META-INF/MANIFEST.MF +++ b/com.ibm.wala.ide.jsdt.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: JSDT Tests Bundle-SymbolicName: com.ibm.wala.ide.jsdt.tests -Bundle-Version: 1.3.7 +Bundle-Version: 1.3.8.qualifier Require-Bundle: com.ibm.wala.core;bundle-version="1.1.3", com.ibm.wala.cast;bundle-version="1.0.0", com.ibm.wala.cast.js;bundle-version="1.0.0", diff --git a/com.ibm.wala.ide.jsdt.tests/pom.xml b/com.ibm.wala.ide.jsdt.tests/pom.xml index de1000796..465344ca6 100644 --- a/com.ibm.wala.ide.jsdt.tests/pom.xml +++ b/com.ibm.wala.ide.jsdt.tests/pom.xml @@ -6,7 +6,7 @@ WALA com.ibm.wala - 1.3.7 + 1.3.8-SNAPSHOT com.ibm.wala.ide.jsdt.tests diff --git a/com.ibm.wala.ide.jsdt/META-INF/MANIFEST.MF b/com.ibm.wala.ide.jsdt/META-INF/MANIFEST.MF index 0c9a6c2cf..21d189d32 100644 --- a/com.ibm.wala.ide.jsdt/META-INF/MANIFEST.MF +++ b/com.ibm.wala.ide.jsdt/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Jsdt Bundle-SymbolicName: com.ibm.wala.ide.jsdt -Bundle-Version: 1.3.7 +Bundle-Version: 1.3.8.qualifier Bundle-Activator: com.ibm.wala.ide.jsdt.Activator Bundle-Vendor: IBM Require-Bundle: org.eclipse.core.runtime, diff --git a/com.ibm.wala.ide.jsdt/pom.xml b/com.ibm.wala.ide.jsdt/pom.xml index f7edf65f6..2fbfb26be 100644 --- a/com.ibm.wala.ide.jsdt/pom.xml +++ b/com.ibm.wala.ide.jsdt/pom.xml @@ -5,7 +5,7 @@ WALA com.ibm.wala - 1.3.7 + 1.3.8-SNAPSHOT com.ibm.wala.ide.jsdt eclipse-plugin diff --git a/com.ibm.wala.ide.tests/META-INF/MANIFEST.MF b/com.ibm.wala.ide.tests/META-INF/MANIFEST.MF index 1c9e15da2..e8ea44a3f 100644 --- a/com.ibm.wala.ide.tests/META-INF/MANIFEST.MF +++ b/com.ibm.wala.ide.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: com.ibm.wala.ide.tests;singleton:=true -Bundle-Version: 1.3.7 +Bundle-Version: 1.3.8.qualifier Bundle-Vendor: %providerName Require-Bundle: com.ibm.wala.shrike, com.ibm.wala.core, diff --git a/com.ibm.wala.ide.tests/pom.xml b/com.ibm.wala.ide.tests/pom.xml index 60e0c389e..6915296a2 100644 --- a/com.ibm.wala.ide.tests/pom.xml +++ b/com.ibm.wala.ide.tests/pom.xml @@ -5,7 +5,7 @@ WALA com.ibm.wala - 1.3.7 + 1.3.8-SNAPSHOT com.ibm.wala.ide.tests eclipse-plugin diff --git a/com.ibm.wala.ide/META-INF/MANIFEST.MF b/com.ibm.wala.ide/META-INF/MANIFEST.MF index 0ad2453e9..9d95049cd 100644 --- a/com.ibm.wala.ide/META-INF/MANIFEST.MF +++ b/com.ibm.wala.ide/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Eclipse-LazyStart: true Bundle-Name: %pluginName Bundle-SymbolicName: com.ibm.wala.ide -Bundle-Version: 1.3.7 +Bundle-Version: 1.3.8.qualifier Bundle-Activator: com.ibm.wala.ide.plugin.CorePlugin Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/com.ibm.wala.ide/pom.xml b/com.ibm.wala.ide/pom.xml index a862cb3ec..6fe2ec956 100644 --- a/com.ibm.wala.ide/pom.xml +++ b/com.ibm.wala.ide/pom.xml @@ -5,7 +5,7 @@ WALA com.ibm.wala - 1.3.7 + 1.3.8-SNAPSHOT com.ibm.wala.ide eclipse-plugin diff --git a/com.ibm.wala.scandroid/META-INF/MANIFEST.MF b/com.ibm.wala.scandroid/META-INF/MANIFEST.MF index 6e1deea1f..13de8b97a 100644 --- a/com.ibm.wala.scandroid/META-INF/MANIFEST.MF +++ b/com.ibm.wala.scandroid/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: SCanDroid Bundle-SymbolicName: com.ibm.wala.scandroid -Bundle-Version: 1.3.7 +Bundle-Version: 1.3.8.qualifier Bundle-Activator: com.ibm.wala.scandroid.Activator Bundle-Vendor: IBM Require-Bundle: org.eclipse.ui, diff --git a/com.ibm.wala.scandroid/pom.xml b/com.ibm.wala.scandroid/pom.xml index e67d59fcd..862fe72c2 100644 --- a/com.ibm.wala.scandroid/pom.xml +++ b/com.ibm.wala.scandroid/pom.xml @@ -5,7 +5,7 @@ WALA com.ibm.wala - 1.3.7 + 1.3.8-SNAPSHOT com.ibm.wala.scandroid eclipse-plugin diff --git a/com.ibm.wala.shrike/META-INF/MANIFEST.MF b/com.ibm.wala.shrike/META-INF/MANIFEST.MF index 7c16075e7..9d173a1fb 100644 --- a/com.ibm.wala.shrike/META-INF/MANIFEST.MF +++ b/com.ibm.wala.shrike/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: com.ibm.wala.shrike -Bundle-Version: 1.3.7 +Bundle-Version: 1.3.8.qualifier Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/com.ibm.wala.shrike/mvncentral.xml b/com.ibm.wala.shrike/mvncentral.xml index f9afa5b62..7bb3e4f4b 100644 --- a/com.ibm.wala.shrike/mvncentral.xml +++ b/com.ibm.wala.shrike/mvncentral.xml @@ -5,7 +5,7 @@ 4.0.0 com.ibm.wala com.ibm.wala.shrike - 1.3.7 + 1.3.8-SNAPSHOT jar WALA Shrike WALA Shrike library for bytecode reading and instrumentation @@ -45,7 +45,7 @@ com.ibm.wala com.ibm.wala.util - 1.3.7 + 1.3.8-SNAPSHOT diff --git a/com.ibm.wala.shrike/pom.xml b/com.ibm.wala.shrike/pom.xml index aee7da94a..96a604228 100644 --- a/com.ibm.wala.shrike/pom.xml +++ b/com.ibm.wala.shrike/pom.xml @@ -5,7 +5,7 @@ WALA com.ibm.wala - 1.3.7 + 1.3.8-SNAPSHOT com.ibm.wala.shrike eclipse-plugin diff --git a/com.ibm.wala.tests-feature/feature.xml b/com.ibm.wala.tests-feature/feature.xml index 771d52965..1947bfb30 100644 --- a/com.ibm.wala.tests-feature/feature.xml +++ b/com.ibm.wala.tests-feature/feature.xml @@ -2,7 +2,7 @@ WALA com.ibm.wala - 1.3.7 + 1.3.8-SNAPSHOT com.ibm.wala.tests-feature eclipse-feature diff --git a/com.ibm.wala.tests.ide-feature/feature.xml b/com.ibm.wala.tests.ide-feature/feature.xml index 581a3a34d..0b134564f 100644 --- a/com.ibm.wala.tests.ide-feature/feature.xml +++ b/com.ibm.wala.tests.ide-feature/feature.xml @@ -2,7 +2,7 @@ 4.0.0 com.ibm.wala com.ibm.wala.util - 1.3.7 + 1.3.8-SNAPSHOT jar WALA utilities Utility library included with the T. J. Watson diff --git a/com.ibm.wala.util/pom.xml b/com.ibm.wala.util/pom.xml index 4f5a62010..7d8d4bdfb 100644 --- a/com.ibm.wala.util/pom.xml +++ b/com.ibm.wala.util/pom.xml @@ -5,7 +5,7 @@ WALA com.ibm.wala - 1.3.7 + 1.3.8-SNAPSHOT com.ibm.wala.util eclipse-plugin diff --git a/pom.xml b/pom.xml index e04de450f..47b78db37 100644 --- a/pom.xml +++ b/pom.xml @@ -5,10 +5,10 @@ 4.0.0 com.ibm.wala WALA - 1.3.7 + 1.3.8-SNAPSHOT pom - 1.3.7 + 1.3.8-SNAPSHOT UTF-8 b000 0.19.0 diff --git a/targets/e42/pom.xml b/targets/e42/pom.xml index 43d33dd48..af7b8fa51 100644 --- a/targets/e42/pom.xml +++ b/targets/e42/pom.xml @@ -5,7 +5,7 @@ com.ibm.wala.target targets - 1.3.7 + 1.3.8-SNAPSHOT e42 eclipse-target-definition diff --git a/targets/e44/pom.xml b/targets/e44/pom.xml index d7ea17338..92588165a 100644 --- a/targets/e44/pom.xml +++ b/targets/e44/pom.xml @@ -5,7 +5,7 @@ com.ibm.wala.target targets - 1.3.7 + 1.3.8-SNAPSHOT e44 eclipse-target-definition diff --git a/targets/pom.xml b/targets/pom.xml index 425b244f0..5bb1fc4da 100644 --- a/targets/pom.xml +++ b/targets/pom.xml @@ -5,7 +5,7 @@ com.ibm.wala WALA - 1.3.7 + 1.3.8-SNAPSHOT com.ibm.wala.target targets From 58b7c7324cb911a46d056f329841c20de6d231e4 Mon Sep 17 00:00:00 2001 From: Julian Dolby Date: Thu, 4 Jun 2015 13:53:25 -0400 Subject: [PATCH 04/10] test for reading java 8 --- .travis.yml | 1 + com.ibm.wala.core.testdata/build.xml | 84 +++++++++++-------- com.ibm.wala.core.testdata/pom.xml | 2 +- .../src/lambda/SortingExample.java | 35 ++++++++ com.ibm.wala.core.tests/META-INF/MANIFEST.MF | 2 +- .../core/tests/basic/ExtensionGraphTest.java | 3 +- .../core/tests/basic/FloydWarshallTest.java | 3 +- .../wala/core/tests/basic/PathFinderTest.java | 3 +- .../wala/core/tests/basic/PrimitivesTest.java | 1 - .../core/tests/basic/WelshPowellTest.java | 3 +- .../core/tests/callGraph/CallGraphTest.java | 9 +- .../tests/callGraph/ClassConstantTest.java | 3 +- .../wala/core/tests/cha/DupFieldsTest.java | 3 +- pom.xml | 2 +- targets/e44/e44.target | 2 +- targets/pom.xml | 2 +- 16 files changed, 105 insertions(+), 53 deletions(-) create mode 100644 com.ibm.wala.core.testdata/src/lambda/SortingExample.java diff --git a/.travis.yml b/.travis.yml index 41115bbd0..2a962ff3b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ language: android +jdk: oraclejdk8 before_install: - "export DISPLAY=:99.0" - "sh -e /etc/init.d/xvfb start" diff --git a/com.ibm.wala.core.testdata/build.xml b/com.ibm.wala.core.testdata/build.xml index e2884744d..36c3437ac 100644 --- a/com.ibm.wala.core.testdata/build.xml +++ b/com.ibm.wala.core.testdata/build.xml @@ -117,49 +117,57 @@ - + - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + - + + + + + + + + + + + + @@ -170,13 +178,13 @@ - + - + - + @@ -211,14 +219,22 @@ + - + - + + + + + + + + - + diff --git a/com.ibm.wala.core.testdata/pom.xml b/com.ibm.wala.core.testdata/pom.xml index 72a679a5a..2ac31b881 100644 --- a/com.ibm.wala.core.testdata/pom.xml +++ b/com.ibm.wala.core.testdata/pom.xml @@ -7,7 +7,7 @@ WALA 1.3.8-SNAPSHOT - jar + eclipse-plugin com.ibm.wala.core.testdata diff --git a/com.ibm.wala.core.testdata/src/lambda/SortingExample.java b/com.ibm.wala.core.testdata/src/lambda/SortingExample.java new file mode 100644 index 000000000..9840dbf55 --- /dev/null +++ b/com.ibm.wala.core.testdata/src/lambda/SortingExample.java @@ -0,0 +1,35 @@ +package lambda; + +import java.util.Arrays; +import java.util.Comparator; + +public class SortingExample { + private final String[] strings; + + public SortingExample(int n) { + this.strings = new String[n]; + for(int i = 0; i < n; i++) { + strings[i] = "str" + i; + } + } + + private String[] sort(Comparator c) { + String[] strs = strings.clone(); + Arrays.sort(strs, c); + return strs; + } + + public String[] sortForward() { + return sort( (String l, String r) -> l.compareTo(r)); + } + + public String[] sortBackward() { + return sort( (String l, String r) -> r.compareTo(l)); + } + + public static void main(String[] args) { + SortingExample x = new SortingExample(10); + System.err.println( Arrays.toString( x.sortForward() )); + System.err.println( Arrays.toString( x.sortBackward() )); + } +} diff --git a/com.ibm.wala.core.tests/META-INF/MANIFEST.MF b/com.ibm.wala.core.tests/META-INF/MANIFEST.MF index f6d5d1e99..ce594f001 100644 --- a/com.ibm.wala.core.tests/META-INF/MANIFEST.MF +++ b/com.ibm.wala.core.tests/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Vendor: %providerName Require-Bundle: com.ibm.wala.shrike, com.ibm.wala.core, org.eclipse.core.runtime, - com.ibm.wala.core.testdata;bundle-version="1.3.4", + com.ibm.wala.core.testdata, org.junit;bundle-version="4.0.0", org.apache.ant Bundle-Localization: plugin diff --git a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/basic/ExtensionGraphTest.java b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/basic/ExtensionGraphTest.java index 382c651b7..599a4e75c 100644 --- a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/basic/ExtensionGraphTest.java +++ b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/basic/ExtensionGraphTest.java @@ -11,8 +11,7 @@ package com.ibm.wala.core.tests.basic; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import com.ibm.wala.util.collections.IteratorUtil; diff --git a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/basic/FloydWarshallTest.java b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/basic/FloydWarshallTest.java index 8c45a5379..fbbf69c9d 100644 --- a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/basic/FloydWarshallTest.java +++ b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/basic/FloydWarshallTest.java @@ -16,8 +16,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import com.ibm.wala.util.graph.INodeWithNumberedEdges; diff --git a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/basic/PathFinderTest.java b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/basic/PathFinderTest.java index 244a78948..bbe719f5e 100644 --- a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/basic/PathFinderTest.java +++ b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/basic/PathFinderTest.java @@ -12,8 +12,7 @@ package com.ibm.wala.core.tests.basic; import java.util.List; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import com.ibm.wala.util.Predicate; diff --git a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/basic/PrimitivesTest.java b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/basic/PrimitivesTest.java index 88a6c9d94..26aa88996 100644 --- a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/basic/PrimitivesTest.java +++ b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/basic/PrimitivesTest.java @@ -891,7 +891,6 @@ public class PrimitivesTest extends WalaTestCase { testSingleBitVector(new OffsetBitVector(100, 10)); } - @SuppressWarnings("unchecked") private void testSingleBitVector(BitVectorBase bv) { // does the following not automatically scale the bitvector to // a reasonable size? diff --git a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/basic/WelshPowellTest.java b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/basic/WelshPowellTest.java index b25940747..876ec79e1 100644 --- a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/basic/WelshPowellTest.java +++ b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/basic/WelshPowellTest.java @@ -13,8 +13,7 @@ package com.ibm.wala.core.tests.basic; import java.util.Iterator; import java.util.Map; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import com.ibm.wala.util.collections.HashMapFactory; diff --git a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/CallGraphTest.java b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/CallGraphTest.java index 0de1f4017..80e504cbf 100644 --- a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/CallGraphTest.java +++ b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/CallGraphTest.java @@ -158,7 +158,14 @@ public class CallGraphTest extends WalaTestCase { Iterable entrypoints = com.ibm.wala.ipa.callgraph.impl.Util.makeMainEntrypoints(scope, cha, "Llambda/SortingExample"); AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints); - CallGraphTestUtil.buildZeroCFA(options, new AnalysisCache(), cha, scope, false); + CallGraph cg = CallGraphTestUtil.buildZeroCFA(options, new AnalysisCache(), cha, scope, false); + boolean foundSortForward = false; + for (CGNode n : cg) { + if (n.toString().contains("sortForward")) { + foundSortForward = true; + } + } + Assert.assertTrue("expected for sortForward", foundSortForward); } @Test public void testSystemProperties() throws ClassHierarchyException, IllegalArgumentException, CancelException, IOException { diff --git a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/ClassConstantTest.java b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/ClassConstantTest.java index 9a68ddd02..4c97579a0 100644 --- a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/ClassConstantTest.java +++ b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/ClassConstantTest.java @@ -13,8 +13,7 @@ package com.ibm.wala.core.tests.callGraph; import java.io.IOException; import java.util.Set; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import com.ibm.wala.core.tests.util.TestConstants; diff --git a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/DupFieldsTest.java b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/DupFieldsTest.java index a17c623c7..d95d84ca9 100644 --- a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/DupFieldsTest.java +++ b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/DupFieldsTest.java @@ -12,8 +12,7 @@ package com.ibm.wala.core.tests.cha; import java.io.IOException; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; import com.ibm.wala.classLoader.IClass; diff --git a/pom.xml b/pom.xml index 47b78db37..a24617c81 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ 1.3.8-SNAPSHOT UTF-8 b000 - 0.19.0 + 0.21.0 scm:git:ssh://github.com:wala/WALA.git diff --git a/targets/e44/e44.target b/targets/e44/e44.target index f5914a57e..33f875873 100644 --- a/targets/e44/e44.target +++ b/targets/e44/e44.target @@ -14,5 +14,5 @@ - + diff --git a/targets/pom.xml b/targets/pom.xml index 5bb1fc4da..bc908356c 100644 --- a/targets/pom.xml +++ b/targets/pom.xml @@ -11,7 +11,7 @@ targets pom - e42 + e44 From 31f9f1b0b5849a6b8b4a81fb5c72fec2cbc1493a Mon Sep 17 00:00:00 2001 From: Julian Dolby Date: Thu, 4 Jun 2015 15:51:46 -0400 Subject: [PATCH 05/10] more exclusions allow 1.8 libs --- com.ibm.wala.core.tests/dat/Java60RegressionExclusions.txt | 7 ++++++- .../com/ibm/wala/core/tests/cha/LibraryVersionTest.java | 2 +- .../src/com/ibm/wala/ipa/callgraph/AnalysisScope.java | 4 ++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/com.ibm.wala.core.tests/dat/Java60RegressionExclusions.txt b/com.ibm.wala.core.tests/dat/Java60RegressionExclusions.txt index ad9232d08..f2bc72dea 100644 --- a/com.ibm.wala.core.tests/dat/Java60RegressionExclusions.txt +++ b/com.ibm.wala.core.tests/dat/Java60RegressionExclusions.txt @@ -1,3 +1,5 @@ +apple\/.* +com\/apple\/.* java\/awt\/.* javax\/swing\/.* sun\/awt\/.* @@ -10,4 +12,7 @@ com\/ibm\/crypto\/.* com\/ibm\/security\/.* org\/apache\/xerces\/.* dalvik\/.* -java\/io\/ObjectStreamClass* \ No newline at end of file +java\/io\/ObjectStreamClass* +jdk\/.* +org\/omg\/.* +org\/w3c\/.* diff --git a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/LibraryVersionTest.java b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/LibraryVersionTest.java index e4edc7210..a803a43d9 100644 --- a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/LibraryVersionTest.java +++ b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/LibraryVersionTest.java @@ -36,7 +36,7 @@ public class LibraryVersionTest extends WalaTestCase { @Test public void testLibraryVersion() throws IOException { AnalysisScope scope = AnalysisScopeReader.readJavaScope(TestConstants.WALA_TESTDATA, (new FileProvider()).getFile("J2SEClassHierarchyExclusions.txt"), MY_CLASSLOADER); System.err.println("java library version is " + scope.getJavaLibraryVersion()); - Assert.assertTrue(scope.isJava17Libraries() || scope.isJava16Libraries() || scope.isJava15Libraries()||scope.isJava14Libraries()); + Assert.assertTrue(scope.isJava18Libraries() || scope.isJava17Libraries() || scope.isJava16Libraries() || scope.isJava15Libraries()||scope.isJava14Libraries()); } } diff --git a/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/AnalysisScope.java b/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/AnalysisScope.java index 7e73e803b..294ebd1e8 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/AnalysisScope.java +++ b/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/AnalysisScope.java @@ -411,6 +411,10 @@ public class AnalysisScope { } } + public boolean isJava18Libraries() throws IllegalStateException { + return getJavaLibraryVersion().startsWith("1.8"); + } + public boolean isJava17Libraries() throws IllegalStateException { return getJavaLibraryVersion().startsWith("1.7"); } From 90a98521a1480b9a1eb3ce2993ac4200253f7e86 Mon Sep 17 00:00:00 2001 From: Julian Dolby Date: Thu, 4 Jun 2015 17:50:24 -0400 Subject: [PATCH 06/10] whitespace --- com.ibm.wala.cast.java.test.data/src/ArrayLiteral1.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/com.ibm.wala.cast.java.test.data/src/ArrayLiteral1.java b/com.ibm.wala.cast.java.test.data/src/ArrayLiteral1.java index 71a5e3205..166fe58aa 100644 --- a/com.ibm.wala.cast.java.test.data/src/ArrayLiteral1.java +++ b/com.ibm.wala.cast.java.test.data/src/ArrayLiteral1.java @@ -10,9 +10,8 @@ *****************************************************************************/ public class ArrayLiteral1 { public static void main(String[] args) { - ArrayLiteral1 al1= new ArrayLiteral1(); - int[] a= new int[] { 0, 1, 2, 3, 5 }; - Object[] b= new Object[] { null, "hi", new Integer(55), new int[] { 3, 1, 4 } }; - + ArrayLiteral1 al1= new ArrayLiteral1(); + int[] a= new int[] { 0, 1, 2, 3, 5 }; + Object[] b= new Object[] { null, "hi", new Integer(55), new int[] { 3, 1, 4 } }; } } \ No newline at end of file From f269bbbcb5036d00a45cbb52366cd93d2b56df1c Mon Sep 17 00:00:00 2001 From: Julian Dolby Date: Thu, 4 Jun 2015 19:04:43 -0400 Subject: [PATCH 07/10] try more memory --- com.ibm.wala.cast.java.polyglot.test/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/com.ibm.wala.cast.java.polyglot.test/pom.xml b/com.ibm.wala.cast.java.polyglot.test/pom.xml index e1ed710ea..01db55607 100644 --- a/com.ibm.wala.cast.java.polyglot.test/pom.xml +++ b/com.ibm.wala.cast.java.polyglot.test/pom.xml @@ -20,7 +20,7 @@ test ${project.build.outputDirectory} - -Xmx800M -ea + -Xmx1200M -ea true ${basedir}/../com.ibm.wala.cast.java.test.data From 5feba2cc2eee1fb1923095ad581e8ecb11c9ef7e Mon Sep 17 00:00:00 2001 From: Julian Dolby Date: Thu, 4 Jun 2015 20:09:41 -0400 Subject: [PATCH 08/10] try removing polyglot from cache --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2a962ff3b..3bb0d02e0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,5 @@ sudo: false cache: directories: - $HOME/.m2 - - $TRAVIS_BUILD_DIR/com.ibm.wala.cast.java.polyglot/lib - - $TRAVIS_BUILD_DIR/com.ibm.wala.core.testdata/ocaml/ocamljava-2.0-alpha1/lib + - $TRAVIS_BUILD_DIR/com.ibm.wala.core.testdata/ocaml/ocamljava-2.0-alpha1/lib \ No newline at end of file From 1b2df793df2fe6e81f42fea2dd6596b4e703b689 Mon Sep 17 00:00:00 2001 From: Julian Dolby Date: Thu, 4 Jun 2015 20:12:01 -0400 Subject: [PATCH 09/10] try removing polyglot from cache --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3bb0d02e0..8d9c3730d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,5 +14,5 @@ sudo: false cache: directories: - $HOME/.m2 - - $TRAVIS_BUILD_DIR/com.ibm.wala.core.testdata/ocaml/ocamljava-2.0-alpha1/lib + - $TRAVIS_BUILD_DIR/com.ibm.wala.core.testdata/ocaml/ocamljava-2.0-alpha1/lib \ No newline at end of file From 93a522eecd853deb0cef39f29be7ce11e57c20af Mon Sep 17 00:00:00 2001 From: Julian Dolby Date: Thu, 4 Jun 2015 20:40:49 -0400 Subject: [PATCH 10/10] abandon polyglot for now --- pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a24617c81..efef3a07c 100644 --- a/pom.xml +++ b/pom.xml @@ -55,7 +55,8 @@ com.ibm.wala.scandroid com.ibm.wala.cast.java.polyglot - com.ibm.wala.cast.java.polyglot.test + + com.ibm.wala-repository