From 2bfc114146460f12d6667f3464766b9b53f19e62 Mon Sep 17 00:00:00 2001
From: Ben Gruver <bgruv@google.com>
Date: Wed, 23 May 2012 14:31:11 -0700
Subject: [PATCH] Clean up the maven configuration

This allows everything to be built with a simple "mvn package" from the root
---
 baksmali/pom.xml                | 50 ++++++---------------------------
 pom.xml                         | 15 ++++++++--
 smali-integration-tests/pom.xml | 36 +++++++++++++-----------
 smali/pom.xml                   |  8 ++++++
 4 files changed, 49 insertions(+), 60 deletions(-)

diff --git a/baksmali/pom.xml b/baksmali/pom.xml
index fbbba6c5..39dfcceb 100644
--- a/baksmali/pom.xml
+++ b/baksmali/pom.xml
@@ -12,48 +12,6 @@
     </parent>
     <build>
         <plugins>
-            <!--<plugin>
-                <groupId>org.jf</groupId>
-                <artifactId>maven-smali-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>junit-tests</id>
-                        <phase>test-compile</phase>
-                        <goals>
-                            <goal>assemble</goal>
-                        </goals>
-                        <configuration>
-                            <sourceDirectory>src/test/smali</sourceDirectory>
-                            <outputFile>target/test/classes.dex</outputFile>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>1.1</version>
-                <executions>
-                    <execution>
-                        <phase>test</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <executable>java</executable>
-                    <workingDirectory>${basedir}</workingDirectory>
-                    <arguments>
-                        <argument>-classpath</argument>
-                        <classpath/>
-                        <argument>org.jf.baksmali.main</argument>
-                        <argument>-dis</argument>
-                        <argument>${project.build.directory}/test/classes.dex</argument>
-                        <argument>${project.build.directory}/test/out</argument>
-                    </arguments>
-                </configuration>
-            </plugin>-->
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <configuration>
@@ -66,6 +24,14 @@
                         </manifest>
                     </archive>
                 </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
         <resources>
diff --git a/pom.xml b/pom.xml
index 08ed9cba..98eee468 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,18 @@
         <module>smali</module>
         <module>baksmali</module>
         <module>util</module>
-        <module>maven-smali-plugin</module>
-        <module>smali-integration-tests</module>
     </modules>
+    <profiles>
+        <profile>
+            <id>integration-tests</id>
+                <modules>
+                    <module>dexlib</module>
+                    <module>smali</module>
+                    <module>baksmali</module>
+                    <module>util</module>
+                    <module>maven-smali-plugin</module>
+                    <module>smali-integration-tests</module>
+                </modules>
+        </profile>
+    </profiles>
 </project>
diff --git a/smali-integration-tests/pom.xml b/smali-integration-tests/pom.xml
index 9ab285cf..001d2ac5 100644
--- a/smali-integration-tests/pom.xml
+++ b/smali-integration-tests/pom.xml
@@ -5,7 +5,6 @@
     <groupId>org.jf</groupId>
     <artifactId>smali-integration-tests</artifactId>
     <version>${aversion}</version>
-    <packaging>pom</packaging>
     <parent>
         <groupId>org.jf</groupId>
         <artifactId>smali-pom</artifactId>
@@ -19,6 +18,7 @@
                 <executions>
                     <execution>
                         <id>junit-tests</id>
+                        <phase>integration-test</phase>
                         <goals>
                             <goal>assemble</goal>
                         </goals>
@@ -30,6 +30,7 @@
                     </execution>
                     <execution>
                         <id>jumbo-string-tests</id>
+                        <phase>integration-test</phase>
                         <goals>
                             <goal>assemble</goal>
                         </goals>
@@ -41,6 +42,7 @@
                     </execution>
                     <execution>
                         <id>jumbo-type-tests</id>
+                        <phase>integration-test</phase>
                         <goals>
                             <goal>assemble</goal>
                         </goals>
@@ -52,6 +54,7 @@
                     </execution>
                     <execution>
                         <id>jumbo-field-tests</id>
+                        <phase>integration-test</phase>
                         <goals>
                             <goal>assemble</goal>
                         </goals>
@@ -63,6 +66,7 @@
                     </execution>
                     <execution>
                         <id>jumbo-method-tests</id>
+                        <phase>integration-test</phase>
                         <goals>
                             <goal>assemble</goal>
                         </goals>
@@ -79,7 +83,7 @@
                 <executions>
                     <execution>
                         <id>junit-tests</id>
-                        <phase>test</phase>
+                        <phase>integration-test</phase>
                         <goals>
                             <goal>single</goal>
                         </goals>
@@ -93,7 +97,7 @@
                     </execution>
                     <execution>
                         <id>jumbo-string-tests</id>
-                        <phase>test</phase>
+                        <phase>integration-test</phase>
                         <goals>
                             <goal>single</goal>
                         </goals>
@@ -107,7 +111,7 @@
                     </execution>
                     <execution>
                         <id>jumbo-type-tests</id>
-                        <phase>test</phase>
+                        <phase>integration-test</phase>
                         <goals>
                             <goal>single</goal>
                         </goals>
@@ -121,7 +125,7 @@
                     </execution>
                     <execution>
                         <id>jumbo-field-tests</id>
-                        <phase>test</phase>
+                        <phase>integration-test</phase>
                         <goals>
                             <goal>single</goal>
                         </goals>
@@ -135,7 +139,7 @@
                     </execution>
                     <execution>
                         <id>jumbo-method-tests</id>
-                        <phase>test</phase>
+                        <phase>integration-test</phase>
                         <goals>
                             <goal>single</goal>
                         </goals>
@@ -155,7 +159,7 @@
                 <executions>
                     <execution>
                         <id>junit-tests</id>
-                        <phase>test</phase>
+                        <phase>integration-test</phase>
                         <goals>
                             <goal>push</goal>
                         </goals>
@@ -166,7 +170,7 @@
                     </execution>
                     <execution>
                         <id>jumbo-string-tests</id>
-                        <phase>test</phase>
+                        <phase>integration-test</phase>
                         <goals>
                             <goal>push</goal>
                         </goals>
@@ -177,7 +181,7 @@
                     </execution>
                     <execution>
                         <id>jumbo-type-tests</id>
-                        <phase>test</phase>
+                        <phase>integration-test</phase>
                         <goals>
                             <goal>push</goal>
                         </goals>
@@ -188,7 +192,7 @@
                     </execution>
                     <execution>
                         <id>jumbo-field-tests</id>
-                        <phase>test</phase>
+                        <phase>integration-test</phase>
                         <goals>
                             <goal>push</goal>
                         </goals>
@@ -199,7 +203,7 @@
                     </execution>
                     <execution>
                         <id>jumbo-method-tests</id>
-                        <phase>test</phase>
+                        <phase>integration-test</phase>
                         <goals>
                             <goal>push</goal>
                         </goals>
@@ -217,7 +221,7 @@
                 <executions>
                     <execution>
                         <id>junit-tests</id>
-                        <phase>test</phase>
+                        <phase>integration-test</phase>
                         <goals>
                             <goal>exec</goal>
                         </goals>
@@ -235,7 +239,7 @@
                     </execution>
                     <execution>
                         <id>jumbo-string-tests</id>
-                        <phase>test</phase>
+                        <phase>integration-test</phase>
                         <goals>
                             <goal>exec</goal>
                         </goals>
@@ -253,7 +257,7 @@
                     </execution>
                     <execution>
                         <id>jumbo-type-tests</id>
-                        <phase>test</phase>
+                        <phase>integration-test</phase>
                         <goals>
                             <goal>exec</goal>
                         </goals>
@@ -271,7 +275,7 @@
                     </execution>
                     <execution>
                         <id>jumbo-field-tests</id>
-                        <phase>test</phase>
+                        <phase>integration-test</phase>
                         <goals>
                             <goal>exec</goal>
                         </goals>
@@ -289,7 +293,7 @@
                     </execution>
                     <execution>
                         <id>jumbo-method-tests</id>
-                        <phase>test</phase>
+                        <phase>integration-test</phase>
                         <goals>
                             <goal>exec</goal>
                         </goals>
diff --git a/smali/pom.xml b/smali/pom.xml
index 3cf1ff80..c70b7de4 100644
--- a/smali/pom.xml
+++ b/smali/pom.xml
@@ -90,6 +90,14 @@
                         </manifest>
                     </archive>
                 </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>