diff --git a/lang-java-reach-soot/pom.xml b/lang-java-reach-soot/pom.xml index 5567b8c5e..2f1a56662 100644 --- a/lang-java-reach-soot/pom.xml +++ b/lang-java-reach-soot/pom.xml @@ -45,9 +45,9 @@ <scope>compile</scope> </dependency> <dependency> - <groupId>ca.mcgill.sable</groupId> + <groupId>org.soot-oss</groupId> <artifactId>soot</artifactId> - <version>4.1.0</version> + <version>4.4.1</version> <scope>compile</scope> <exclusions> <exclusion> diff --git a/lang-java-reach-soot/src/main/java/org/eclipse/steady/cg/soot/CustomEntryPointCreator.java b/lang-java-reach-soot/src/main/java/org/eclipse/steady/cg/soot/CustomEntryPointCreator.java index 8ee90b34d..d4355d168 100644 --- a/lang-java-reach-soot/src/main/java/org/eclipse/steady/cg/soot/CustomEntryPointCreator.java +++ b/lang-java-reach-soot/src/main/java/org/eclipse/steady/cg/soot/CustomEntryPointCreator.java @@ -18,18 +18,47 @@ */ package org.eclipse.steady.cg.soot; +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import soot.*; -import soot.javaToJimple.LocalGenerator; -import soot.jimple.*; + +import soot.Body; +import soot.BooleanType; +import soot.ByteType; +import soot.CharType; +import soot.DoubleType; +import soot.FloatType; +import soot.IntType; +import soot.Local; +import soot.LocalGenerator; +import soot.LongType; +import soot.Modifier; +import soot.RefType; +import soot.Scene; +import soot.ShortType; +import soot.SootClass; +import soot.SootMethod; +import soot.SootMethodRef; +import soot.Type; +import soot.VoidType; +import soot.javaToJimple.DefaultLocalGenerator; +import soot.jimple.AssignStmt; +import soot.jimple.Jimple; +import soot.jimple.JimpleBody; +import soot.jimple.NullConstant; +import soot.jimple.SpecialInvokeExpr; +import soot.jimple.Stmt; import soot.jimple.infoflow.data.SootMethodAndClass; import soot.jimple.infoflow.entryPointCreators.DefaultEntryPointCreator; import soot.jimple.infoflow.util.SootMethodRepresentationParser; import soot.jimple.internal.JNopStmt; -import java.util.*; - /** * <p>CustomEntryPointCreator class.</p> */ @@ -260,7 +289,7 @@ private SootMethod generateMethodImplementation( // add locals for Parameter // Add a parameter reference to the body - LocalGenerator lg = new LocalGenerator(body); + LocalGenerator lg = new DefaultLocalGenerator(body); // create a local for the this reference if (!methodToImplement.isStatic()) { diff --git a/pom.xml b/pom.xml index 50562ade7..204d6e36e 100755 --- a/pom.xml +++ b/pom.xml @@ -644,7 +644,7 @@ <plugin> <groupId>org.jacoco</groupId> <artifactId>jacoco-maven-plugin</artifactId> - <version>0.8.5</version> + <version>0.8.10</version> <configuration> <excludes> <!-- Exclude ANTLR generated classes -->