Clean up the maven configuration

This allows everything to be built with a simple "mvn package" from the root
This commit is contained in:
Ben Gruver 2012-05-23 14:31:11 -07:00
parent 36c2f08ba0
commit 2bfc114146
4 changed files with 49 additions and 60 deletions

View File

@ -12,48 +12,6 @@
</parent> </parent>
<build> <build>
<plugins> <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> <plugin>
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
<configuration> <configuration>
@ -66,6 +24,14 @@
</manifest> </manifest>
</archive> </archive>
</configuration> </configuration>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin> </plugin>
</plugins> </plugins>
<resources> <resources>

15
pom.xml
View File

@ -26,7 +26,18 @@
<module>smali</module> <module>smali</module>
<module>baksmali</module> <module>baksmali</module>
<module>util</module> <module>util</module>
<module>maven-smali-plugin</module>
<module>smali-integration-tests</module>
</modules> </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> </project>

View File

@ -5,7 +5,6 @@
<groupId>org.jf</groupId> <groupId>org.jf</groupId>
<artifactId>smali-integration-tests</artifactId> <artifactId>smali-integration-tests</artifactId>
<version>${aversion}</version> <version>${aversion}</version>
<packaging>pom</packaging>
<parent> <parent>
<groupId>org.jf</groupId> <groupId>org.jf</groupId>
<artifactId>smali-pom</artifactId> <artifactId>smali-pom</artifactId>
@ -19,6 +18,7 @@
<executions> <executions>
<execution> <execution>
<id>junit-tests</id> <id>junit-tests</id>
<phase>integration-test</phase>
<goals> <goals>
<goal>assemble</goal> <goal>assemble</goal>
</goals> </goals>
@ -30,6 +30,7 @@
</execution> </execution>
<execution> <execution>
<id>jumbo-string-tests</id> <id>jumbo-string-tests</id>
<phase>integration-test</phase>
<goals> <goals>
<goal>assemble</goal> <goal>assemble</goal>
</goals> </goals>
@ -41,6 +42,7 @@
</execution> </execution>
<execution> <execution>
<id>jumbo-type-tests</id> <id>jumbo-type-tests</id>
<phase>integration-test</phase>
<goals> <goals>
<goal>assemble</goal> <goal>assemble</goal>
</goals> </goals>
@ -52,6 +54,7 @@
</execution> </execution>
<execution> <execution>
<id>jumbo-field-tests</id> <id>jumbo-field-tests</id>
<phase>integration-test</phase>
<goals> <goals>
<goal>assemble</goal> <goal>assemble</goal>
</goals> </goals>
@ -63,6 +66,7 @@
</execution> </execution>
<execution> <execution>
<id>jumbo-method-tests</id> <id>jumbo-method-tests</id>
<phase>integration-test</phase>
<goals> <goals>
<goal>assemble</goal> <goal>assemble</goal>
</goals> </goals>
@ -79,7 +83,7 @@
<executions> <executions>
<execution> <execution>
<id>junit-tests</id> <id>junit-tests</id>
<phase>test</phase> <phase>integration-test</phase>
<goals> <goals>
<goal>single</goal> <goal>single</goal>
</goals> </goals>
@ -93,7 +97,7 @@
</execution> </execution>
<execution> <execution>
<id>jumbo-string-tests</id> <id>jumbo-string-tests</id>
<phase>test</phase> <phase>integration-test</phase>
<goals> <goals>
<goal>single</goal> <goal>single</goal>
</goals> </goals>
@ -107,7 +111,7 @@
</execution> </execution>
<execution> <execution>
<id>jumbo-type-tests</id> <id>jumbo-type-tests</id>
<phase>test</phase> <phase>integration-test</phase>
<goals> <goals>
<goal>single</goal> <goal>single</goal>
</goals> </goals>
@ -121,7 +125,7 @@
</execution> </execution>
<execution> <execution>
<id>jumbo-field-tests</id> <id>jumbo-field-tests</id>
<phase>test</phase> <phase>integration-test</phase>
<goals> <goals>
<goal>single</goal> <goal>single</goal>
</goals> </goals>
@ -135,7 +139,7 @@
</execution> </execution>
<execution> <execution>
<id>jumbo-method-tests</id> <id>jumbo-method-tests</id>
<phase>test</phase> <phase>integration-test</phase>
<goals> <goals>
<goal>single</goal> <goal>single</goal>
</goals> </goals>
@ -155,7 +159,7 @@
<executions> <executions>
<execution> <execution>
<id>junit-tests</id> <id>junit-tests</id>
<phase>test</phase> <phase>integration-test</phase>
<goals> <goals>
<goal>push</goal> <goal>push</goal>
</goals> </goals>
@ -166,7 +170,7 @@
</execution> </execution>
<execution> <execution>
<id>jumbo-string-tests</id> <id>jumbo-string-tests</id>
<phase>test</phase> <phase>integration-test</phase>
<goals> <goals>
<goal>push</goal> <goal>push</goal>
</goals> </goals>
@ -177,7 +181,7 @@
</execution> </execution>
<execution> <execution>
<id>jumbo-type-tests</id> <id>jumbo-type-tests</id>
<phase>test</phase> <phase>integration-test</phase>
<goals> <goals>
<goal>push</goal> <goal>push</goal>
</goals> </goals>
@ -188,7 +192,7 @@
</execution> </execution>
<execution> <execution>
<id>jumbo-field-tests</id> <id>jumbo-field-tests</id>
<phase>test</phase> <phase>integration-test</phase>
<goals> <goals>
<goal>push</goal> <goal>push</goal>
</goals> </goals>
@ -199,7 +203,7 @@
</execution> </execution>
<execution> <execution>
<id>jumbo-method-tests</id> <id>jumbo-method-tests</id>
<phase>test</phase> <phase>integration-test</phase>
<goals> <goals>
<goal>push</goal> <goal>push</goal>
</goals> </goals>
@ -217,7 +221,7 @@
<executions> <executions>
<execution> <execution>
<id>junit-tests</id> <id>junit-tests</id>
<phase>test</phase> <phase>integration-test</phase>
<goals> <goals>
<goal>exec</goal> <goal>exec</goal>
</goals> </goals>
@ -235,7 +239,7 @@
</execution> </execution>
<execution> <execution>
<id>jumbo-string-tests</id> <id>jumbo-string-tests</id>
<phase>test</phase> <phase>integration-test</phase>
<goals> <goals>
<goal>exec</goal> <goal>exec</goal>
</goals> </goals>
@ -253,7 +257,7 @@
</execution> </execution>
<execution> <execution>
<id>jumbo-type-tests</id> <id>jumbo-type-tests</id>
<phase>test</phase> <phase>integration-test</phase>
<goals> <goals>
<goal>exec</goal> <goal>exec</goal>
</goals> </goals>
@ -271,7 +275,7 @@
</execution> </execution>
<execution> <execution>
<id>jumbo-field-tests</id> <id>jumbo-field-tests</id>
<phase>test</phase> <phase>integration-test</phase>
<goals> <goals>
<goal>exec</goal> <goal>exec</goal>
</goals> </goals>
@ -289,7 +293,7 @@
</execution> </execution>
<execution> <execution>
<id>jumbo-method-tests</id> <id>jumbo-method-tests</id>
<phase>test</phase> <phase>integration-test</phase>
<goals> <goals>
<goal>exec</goal> <goal>exec</goal>
</goals> </goals>

View File

@ -90,6 +90,14 @@
</manifest> </manifest>
</archive> </archive>
</configuration> </configuration>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>