Skip to content

Commit 1fe168b

Browse files
StevenArztStevenArzt
committed
Merge branch 'develop' of github.com:secure-software-engineering/FlowDroid into develop
2 parents e7c2b65 + 93df7e4 commit 1fe168b

File tree

6 files changed

+29
-101
lines changed

6 files changed

+29
-101
lines changed

‎pom.xml

+29
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,33 @@
2121
<module>soot-infoflow-cmd</module>
2222
</modules>
2323

24+
<dependencyManagement>
25+
<dependencies>
26+
<dependency>
27+
<groupId>org.slf4j</groupId>
28+
<artifactId>slf4j-api</artifactId>
29+
<version>1.7.5</version>
30+
</dependency>
31+
<dependency>
32+
<groupId>log4j</groupId>
33+
<artifactId>log4j</artifactId>
34+
<version>1.2.15</version>
35+
<scope>test</scope>
36+
<exclusions>
37+
<exclusion>
38+
<groupId>com.sun.jmx</groupId>
39+
<artifactId>jmxri</artifactId>
40+
</exclusion>
41+
<exclusion>
42+
<groupId>com.sun.jdmk</groupId>
43+
<artifactId>jmxtools</artifactId>
44+
</exclusion>
45+
<exclusion>
46+
<groupId>javax.jms</groupId>
47+
<artifactId>jms</artifactId>
48+
</exclusion>
49+
</exclusions>
50+
</dependency>
51+
</dependencies>
52+
</dependencyManagement>
2453
</project>

‎soot-infoflow-android/pom.xml

-25
Original file line numberDiff line numberDiff line change
@@ -122,31 +122,6 @@
122122
<version>1.3</version>
123123
<scope>test</scope>
124124
</dependency>
125-
<dependency>
126-
<groupId>org.slf4j</groupId>
127-
<artifactId>slf4j-api</artifactId>
128-
<version>1.7.25</version>
129-
</dependency>
130-
<dependency>
131-
<groupId>log4j</groupId>
132-
<artifactId>log4j</artifactId>
133-
<version>1.2.15</version>
134-
135-
<exclusions>
136-
<exclusion>
137-
<groupId>com.sun.jmx</groupId>
138-
<artifactId>jmxri</artifactId>
139-
</exclusion>
140-
<exclusion>
141-
<groupId>com.sun.jdmk</groupId>
142-
<artifactId>jmxtools</artifactId>
143-
</exclusion>
144-
<exclusion>
145-
<groupId>javax.jms</groupId>
146-
<artifactId>jms</artifactId>
147-
</exclusion>
148-
</exclusions>
149-
</dependency>
150125
<dependency>
151126
<groupId>pxb.android</groupId>
152127
<artifactId>axml</artifactId>

‎soot-infoflow-cmd/pom.xml

-25
Original file line numberDiff line numberDiff line change
@@ -120,31 +120,6 @@
120120
<artifactId>soot</artifactId>
121121
<version>3.1.0-SNAPSHOT</version>
122122
</dependency>
123-
<dependency>
124-
<groupId>org.slf4j</groupId>
125-
<artifactId>slf4j-api</artifactId>
126-
<version>1.7.25</version>
127-
</dependency>
128-
<dependency>
129-
<groupId>log4j</groupId>
130-
<artifactId>log4j</artifactId>
131-
<version>1.2.15</version>
132-
133-
<exclusions>
134-
<exclusion>
135-
<groupId>com.sun.jmx</groupId>
136-
<artifactId>jmxri</artifactId>
137-
</exclusion>
138-
<exclusion>
139-
<groupId>com.sun.jdmk</groupId>
140-
<artifactId>jmxtools</artifactId>
141-
</exclusion>
142-
<exclusion>
143-
<groupId>javax.jms</groupId>
144-
<artifactId>jms</artifactId>
145-
</exclusion>
146-
</exclusions>
147-
</dependency>
148123
<dependency>
149124
<groupId>commons-cli</groupId>
150125
<artifactId>commons-cli</artifactId>

‎soot-infoflow-summaries/pom.xml

-25
Original file line numberDiff line numberDiff line change
@@ -159,31 +159,6 @@
159159
<version>1.3</version>
160160
<scope>test</scope>
161161
</dependency>
162-
<dependency>
163-
<groupId>org.slf4j</groupId>
164-
<artifactId>slf4j-api</artifactId>
165-
<version>1.7.25</version>
166-
</dependency>
167-
<dependency>
168-
<groupId>log4j</groupId>
169-
<artifactId>log4j</artifactId>
170-
<version>1.2.15</version>
171-
172-
<exclusions>
173-
<exclusion>
174-
<groupId>com.sun.jmx</groupId>
175-
<artifactId>jmxri</artifactId>
176-
</exclusion>
177-
<exclusion>
178-
<groupId>com.sun.jdmk</groupId>
179-
<artifactId>jmxtools</artifactId>
180-
</exclusion>
181-
<exclusion>
182-
<groupId>javax.jms</groupId>
183-
<artifactId>jms</artifactId>
184-
</exclusion>
185-
</exclusions>
186-
</dependency>
187162
<!-- https://mvnrepository.com/artifact/com.google.guava/guava -->
188163
<dependency>
189164
<groupId>com.google.guava</groupId>

‎soot-infoflow/.classpath

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
33
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
4-
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
54
<classpathentry kind="src" path="src"/>
65
<classpathentry kind="src" path="test"/>
76
<classpathentry kind="src" path="securiBench"/>

‎soot-infoflow/pom.xml

-25
Original file line numberDiff line numberDiff line change
@@ -138,31 +138,6 @@
138138
<version>1.4</version>
139139
<scope>test</scope>
140140
</dependency>
141-
<dependency>
142-
<groupId>org.slf4j</groupId>
143-
<artifactId>slf4j-api</artifactId>
144-
<version>1.7.25</version>
145-
</dependency>
146-
<dependency>
147-
<groupId>log4j</groupId>
148-
<artifactId>log4j</artifactId>
149-
<version>1.2.15</version>
150-
151-
<exclusions>
152-
<exclusion>
153-
<groupId>com.sun.jmx</groupId>
154-
<artifactId>jmxri</artifactId>
155-
</exclusion>
156-
<exclusion>
157-
<groupId>com.sun.jdmk</groupId>
158-
<artifactId>jmxtools</artifactId>
159-
</exclusion>
160-
<exclusion>
161-
<groupId>javax.jms</groupId>
162-
<artifactId>jms</artifactId>
163-
</exclusion>
164-
</exclusions>
165-
</dependency>
166141
<dependency>
167142
<groupId>net.sf.trove4j</groupId>
168143
<artifactId>trove4j</artifactId>

0 commit comments

Comments
 (0)