Permalink
Browse files

Merge branch 'master' of github.com:novoda/public-mvn-repo

  • Loading branch information...
2 parents 71899e0 + aa39d35 commit ef4c6cc5c8e23f5f559eb02fa6b7e2a0edc60499 @ouchadam ouchadam committed Jan 11, 2013
@@ -9,14 +9,14 @@
</parent>
<groupId>com.novoda</groupId>
<artifactId>android</artifactId>
- <version>2.0.3</version>
+ <version>2.0.4</version>
<name>android</name>
<packaging>pom</packaging>
<properties>
<android.version>2.2</android.version>
<android.sdk.platform>8</android.sdk.platform>
- <android.maven.plugin.version>3.4.1</android.maven.plugin.version>
+ <android.maven.plugin.version>3.5.0</android.maven.plugin.version>
</properties>
<build>
@@ -6,12 +6,12 @@
<parent>
<groupId>com.novoda</groupId>
<artifactId>android</artifactId>
- <version>2.0.3</version>
+ <version>2.0.4</version>
</parent>
<groupId>com.novoda</groupId>
<artifactId>reporting</artifactId>
- <version>1.1.0</version>
+ <version>1.2.0</version>
<name>reporting</name>
<packaging>pom</packaging>
@@ -85,6 +85,16 @@
<configLocation>${reporting.checkstyle.rules}</configLocation>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>2.5.2</version>
+ <configuration>
+ <xmlOutput>true</xmlOutput>
+ <onlyAnalyze>${reporting.package.analyze}</onlyAnalyze>
+ <excludeFilterFile>${reporting.findbugs.exclude}</excludeFilterFile>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
</build>
@@ -94,17 +104,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
- <version>2.5.1</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>2.5.1</version>
- <configuration>
- <xmlOutput>true</xmlOutput>
- <onlyAnalyze>${reporting.package.analyze}</onlyAnalyze>
- <excludeFilterFile>${reporting.findbugs.exclude}</excludeFilterFile>
- </configuration>
+ <version>2.5.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>com.novoda</groupId>
+ <artifactId>team</artifactId>
+ <version>1.4</version>
+ </parent>
+ <groupId>com.novoda</groupId>
+ <artifactId>android</artifactId>
+ <version>2.0.4</version>
+ <name>android</name>
+ <packaging>pom</packaging>
+
+ <properties>
+ <android.version>2.2</android.version>
+ <android.sdk.platform>8</android.sdk.platform>
+ <android.maven.plugin.version>3.5.0</android.maven.plugin.version>
+ </properties>
+
+ <build>
+ <finalName>${project.artifactId}</finalName>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-jarsigner-plugin</artifactId>
+ <version>1.2</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.4.1</version>
+ </plugin>
+ <plugin>
+ <groupId>com.jayway.maven.plugins.android.generation2</groupId>
+ <artifactId>android-maven-plugin</artifactId>
+ <version>${android.maven.plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.1.1</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.2</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>com.jayway.maven.plugins.android.generation2</groupId>
+ <artifactId>android-maven-plugin</artifactId>
+ <version>${android.maven.plugin.version}</version>
+ <configuration>
+ <sdk>
+ <platform>${android.sdk.platform}</platform>
+ </sdk>
+ <deleteConflictingFiles>true</deleteConflictingFiles>
+ <undeployBeforeDeploy>true</undeployBeforeDeploy>
+ <enableIntegrationTest>true</enableIntegrationTest>
+ <extractDuplicates>true</extractDuplicates>
+ <manifest>
+ <!--
+ Is already the default version
+ <versionName>${project.version}</versionName>
+ -->
+ <debuggable>true</debuggable>
+ <versionCodeAutoIncrement>true</versionCodeAutoIncrement>
+ </manifest>
+ </configuration>
+ <extensions>true</extensions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
+ <useReleaseProfile>false</useReleaseProfile>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>eclipse</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-dependencies</id>
+ <phase>initialize</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>libs</outputDirectory>
+ <excludeArtifactIds>${eclipse.excludeArtifactIds}</excludeArtifactIds>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>libs</directory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-jarsigner-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>signing</id>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ <phase>package</phase>
+ <inherited>true</inherited>
+ <configuration>
+ <archiveDirectory></archiveDirectory>
+ <includes>
+ <include>target/*.apk</include>
+ </includes>
+ <keystore>${sign.keystore}</keystore>
+ <storepass>${sign.storepass}</storepass>
+ <keypass>${sign.keypass}</keypass>
+ <alias>${sign.alias}</alias>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>com.jayway.maven.plugins.android.generation2</groupId>
+ <artifactId>android-maven-plugin</artifactId>
+ <version>${android.maven.plugin.version}</version>
+ <configuration>
+ <sign>
+ <debug>false</debug>
+ </sign>
+ <manifest>
+ <debuggable>false</debuggable>
+ </manifest>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>zipalign</id>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <phase>install</phase>
+ <configuration>
+ <executable>${ANDROID_HOME}/tools/zipalign</executable>
+ <arguments>
+ <argument>-f</argument>
+ <argument>4</argument>
+ <argument>target/${project.build.finalName}.apk</argument>
+ <argument>target/${project.build.finalName}-zipped.apk</argument>
+ </arguments>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
@@ -0,0 +1 @@
+9fbca5362a5109726bd3768290223e21
@@ -0,0 +1 @@
+919a5ffa7b93db9dc414a6175f9685e6f34e7b8d
@@ -3,7 +3,7 @@
<groupId>com.novoda</groupId>
<artifactId>android</artifactId>
<versioning>
- <release>2.0.3</release>
+ <release>2.0.4</release>
<versions>
<version>0.1.1</version>
<version>0.1.2</version>
@@ -17,7 +17,8 @@
<version>2.0.1</version>
<version>2.0.2</version>
<version>2.0.3</version>
+ <version>2.0.4</version>
</versions>
- <lastUpdated>20121126120200</lastUpdated>
+ <lastUpdated>20121220113524</lastUpdated>
</versioning>
</metadata>
@@ -1 +1 @@
-5b1fb437eab699b0c48a5bf9f0d8517b
+e39f39dc208d4d82469767ee94956ce6
@@ -1 +1 @@
-301d7a728289a80bd0c6993ee8c6f3b720e4d222
+24a0f761280d6bd72643baff739492226598be59
Oops, something went wrong. Retry.

0 comments on commit ef4c6cc

Please sign in to comment.