From 2996a704e392a36c802bd0639b34e6d26b0fce36 Mon Sep 17 00:00:00 2001
From: Michael Herzberg <michael.herzberg@sap.com>
Date: Wed, 8 Jul 2015 13:03:03 +0200
Subject: [PATCH] Changed some pom.xmls and build.properties to use maven
 dependencies for some and put the class files not in nested jars but on the
 top level.

---
 com.ibm.wala.cast.js.rhino/pom.xml         |  7 +++++++
 com.ibm.wala.cast.js.test/build.properties |  6 +++---
 com.ibm.wala.cast.js/pom.xml               |  7 +++++++
 com.ibm.wala.dalvik.test/build.properties  |  3 ++-
 com.ibm.wala.dalvik/build.properties       |  6 +++---
 com.ibm.wala.dalvik/pom.xml                | 13 +++++++++++++
 6 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/com.ibm.wala.cast.js.rhino/pom.xml b/com.ibm.wala.cast.js.rhino/pom.xml
index 9f97c9c9c..fb7751fc6 100644
--- a/com.ibm.wala.cast.js.rhino/pom.xml
+++ b/com.ibm.wala.cast.js.rhino/pom.xml
@@ -10,6 +10,13 @@
 	</parent>
 	<artifactId>com.ibm.wala.cast.js.rhino</artifactId>
 	<packaging>eclipse-plugin</packaging>
+	<dependencies>
+		<dependency>
+			<groupId>org.mozilla</groupId>
+			<artifactId>rhino</artifactId>
+			<version>1.7R3</version>
+		</dependency>
+	</dependencies>
 	<build>
                <plugins>
                     <plugin>
diff --git a/com.ibm.wala.cast.js.test/build.properties b/com.ibm.wala.cast.js.test/build.properties
index 0e78413c5..8187a7df8 100755
--- a/com.ibm.wala.cast.js.test/build.properties
+++ b/com.ibm.wala.cast.js.test/build.properties
@@ -1,4 +1,4 @@
-source.test.jar = harness-src/
-output.test.jar = bin/
-bin.includes = test.jar,\
+source.. = harness-src/
+output.. = bin/
+bin.includes = .,\
                META-INF/
diff --git a/com.ibm.wala.cast.js/pom.xml b/com.ibm.wala.cast.js/pom.xml
index e467b0c39..50fa1f456 100644
--- a/com.ibm.wala.cast.js/pom.xml
+++ b/com.ibm.wala.cast.js/pom.xml
@@ -11,6 +11,13 @@
 	<groupId>com.ibm.wala</groupId>
 	<artifactId>com.ibm.wala.cast.js</artifactId>
 	<packaging>eclipse-plugin</packaging>
+	<dependencies>
+		<dependency>
+			<groupId>net.htmlparser.jericho</groupId>
+			<artifactId>jericho-html</artifactId>
+			<version>3.2</version>
+		</dependency>
+	</dependencies>
 	<build>
                <plugins>
                     <plugin>
diff --git a/com.ibm.wala.dalvik.test/build.properties b/com.ibm.wala.dalvik.test/build.properties
index ed825d0f8..6ad9058aa 100644
--- a/com.ibm.wala.dalvik.test/build.properties
+++ b/com.ibm.wala.dalvik.test/build.properties
@@ -1,7 +1,8 @@
 source.. = source/,\
            data/
 output.. = bin/
-bin.includes = META-INF/,\
+bin.includes = .,\
+           META-INF/,\
 	       lib/dx.jar
 jars.extra.classpath = lib/dx.jar
 jre.compilation.profile = JavaSE-1.7
diff --git a/com.ibm.wala.dalvik/build.properties b/com.ibm.wala.dalvik/build.properties
index 5d03b4029..fe7a3fefe 100644
--- a/com.ibm.wala.dalvik/build.properties
+++ b/com.ibm.wala.dalvik/build.properties
@@ -1,4 +1,5 @@
-source.dalvik.jar = src/
+source.. = src/
+output.. = bin/
 bin.includes = META-INF/,\
 			   .,\
                lib/commons-cli-1.2.jar,\
@@ -7,5 +8,4 @@ bin.includes = META-INF/,\
                lib/guava-13.0.1.jar,\
                lib/logback-classic-1.0.9.jar,\
                lib/logback-core-1.0.9.jar,\
-               lib/slf4j-api-1.7.2.jar,\
-               dalvik.jar
+               lib/slf4j-api-1.7.2.jar
diff --git a/com.ibm.wala.dalvik/pom.xml b/com.ibm.wala.dalvik/pom.xml
index 159311940..c97f9eeab 100644
--- a/com.ibm.wala.dalvik/pom.xml
+++ b/com.ibm.wala.dalvik/pom.xml
@@ -11,6 +11,19 @@
 	<artifactId>com.ibm.wala.dalvik</artifactId>
 	<packaging>eclipse-plugin</packaging>
 
+	<dependencies>
+		<dependency>
+			<groupId>dexlib</groupId>
+			<artifactId>dexlib</artifactId>
+			<version>1.3.4</version>
+		</dependency>
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<version>13.0.1</version>
+		</dependency>
+	</dependencies>
+
 	<build>
 		<plugins>
 			<plugin>