Merge branch 'master' of github.com:secure-software-engineering/FlowDroid into develop

Author: StevenArzt

pom.xml

@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>de.fraunhofer.sit.flowdroid</groupId>
 	<artifactId>parent</artifactId>
-	<version>2.7-SNAPSHOT</version>
+	<version>2.6.1</version>
 	<name>FlowDroid Parent Module</name>
 	<packaging>pom</packaging>
 

soot-infoflow-android/pom.xml

@@ -5,7 +5,7 @@
 	<groupId>de.tud.sse</groupId>
 	<artifactId>soot-infoflow-android</artifactId>
 	<name>soot-infoflow-android</name>
-	<version>2.7-SNAPSHOT</version>
+	<version>2.6.1</version>
 	<description>Android-specific components of FlowDroid</description>
 	<properties>
 		<maven.compiler.source>1.7</maven.compiler.source>
@@ -93,7 +93,7 @@
 		<dependency>
 			<groupId>de.tud.sse</groupId>
 			<artifactId>soot-infoflow</artifactId>
-			<version>2.7-SNAPSHOT</version>
+			<version>2.6.1</version>
 		</dependency>
 		<dependency>
 			<groupId>heros</groupId>

soot-infoflow-cmd/pom.xml

@@ -5,7 +5,7 @@
 	<groupId>de.tud.sse</groupId>
 	<artifactId>soot-infoflow-cmd</artifactId>
 	<name>FlowDroid Command Line Util</name>
-	<version>2.7-SNAPSHOT</version>
+	<version>2.6.1</version>
 	<description>Command-line utility for running FlowDroid</description>
 	<properties>
 		<maven.compiler.source>1.7</maven.compiler.source>
@@ -103,12 +103,12 @@
 		<dependency>
 			<groupId>de.tud.sse</groupId>
 			<artifactId>soot-infoflow-android</artifactId>
-			<version>2.7-SNAPSHOT</version>
+			<version>2.6.1</version>
 		</dependency>
 		<dependency>
 			<groupId>de.tud.sse</groupId>
 			<artifactId>soot-infoflow-summaries</artifactId>
-			<version>2.7-SNAPSHOT</version>
+			<version>2.6.1</version>
 		</dependency>
 		<dependency>
 			<groupId>heros</groupId>
@@ -125,6 +125,15 @@
 			<artifactId>commons-cli</artifactId>
 			<version>1.4</version>
 		</dependency>
+		
+		<!-- We need this dependency to have output on the command
+		line for the JAR with dependencies -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <version>1.7.5</version>
+            <optional>true</optional>
+        </dependency>
 	</dependencies>
 
 	<repositories>

soot-infoflow-summaries/pom.xml

@@ -5,7 +5,7 @@
 	<groupId>de.tud.sse</groupId>
 	<artifactId>soot-infoflow-summaries</artifactId>
 	<name>StubDroid</name>
-	<version>2.7-SNAPSHOT</version>
+	<version>2.6.1</version>
 	<description>Data Flow Summaries for FlowDroid</description>
 	<packaging>jar</packaging>
 
@@ -116,7 +116,7 @@
 		<dependency>
 			<groupId>de.tud.sse</groupId>
 			<artifactId>soot-infoflow</artifactId>
-			<version>2.7-SNAPSHOT</version>
+			<version>2.6.1</version>
 			<type>test-jar</type>
 			<scope>test</scope>
 
@@ -134,7 +134,7 @@
 		<dependency>
 			<groupId>de.tud.sse</groupId>
 			<artifactId>soot-infoflow</artifactId>
-			<version>2.7-SNAPSHOT</version>
+			<version>2.6.1</version>
 
 			<exclusions>
 				<exclusion>

soot-infoflow/pom.xml

@@ -5,7 +5,7 @@
 	<groupId>de.tud.sse</groupId>
 	<artifactId>soot-infoflow</artifactId>
 	<name>soot-infoflow</name>
-	<version>2.7-SNAPSHOT</version>
+	<version>2.6.1</version>
 	<description>Soot extending data flow tracking components for Java</description>
 	<packaging>jar</packaging>