Merge branch 'master' into arichnad

This commit is contained in:
Ryszard Wiśniewski 2011-04-26 03:22:37 +02:00
commit 0bd967bacc
3 changed files with 13 additions and 1 deletions

View File

@ -15,6 +15,10 @@
<name>apktool cli</name> <name>apktool cli</name>
<properties>
<root.basedir>${project.parent.basedir}</root.basedir>
</properties>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>

View File

@ -17,6 +17,7 @@
<properties> <properties>
<smaliVersion>1.2.4-brut3</smaliVersion> <smaliVersion>1.2.4-brut3</smaliVersion>
<root.basedir>${project.parent.basedir}</root.basedir>
</properties> </properties>
<build> <build>

View File

@ -12,6 +12,7 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<root.basedir>${basedir}</root.basedir>
</properties> </properties>
<modules> <modules>
@ -36,8 +37,14 @@
<groupId>com.mycila.maven-license-plugin</groupId> <groupId>com.mycila.maven-license-plugin</groupId>
<artifactId>maven-license-plugin</artifactId> <artifactId>maven-license-plugin</artifactId>
<configuration> <configuration>
<header>${project.parent.basedir}/src/templates/apache2.0-header.txt</header> <header>${root.basedir}/src/templates/apache2.0-header.txt</header>
<strictCheck>true</strictCheck> <strictCheck>true</strictCheck>
<excludes>
<exclude>.gitignore</exclude>
<exclude>LICENSE</exclude>
<exclude>NOTICE</exclude>
<exclude>NOTICE-smali</exclude>
</excludes>
</configuration> </configuration>
<executions> <executions>
<execution> <execution>