Skip to content

Commit

Permalink
[plugin updates] Update 'android-maven-plugin' version
Browse files Browse the repository at this point in the history
-- Fix build with Oracle Java 8
-- Add 'findbugs-exclude.xml' rules
  • Loading branch information
Antony Mykolaj committed May 2, 2016
1 parent db98ee8 commit eb0c639
Show file tree
Hide file tree
Showing 10 changed files with 35 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<build>
<plugins>
<plugin>
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
<groupId>com.simpligility.maven.plugins</groupId>
<artifactId>android-maven-plugin</artifactId>
</plugin>
<plugin>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
<build>
<plugins>
<plugin>
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
<groupId>com.simpligility.maven.plugins</groupId>
<artifactId>android-maven-plugin</artifactId>
</plugin>
<plugin>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<build>
<plugins>
<plugin>
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
<groupId>com.simpligility.maven.plugins</groupId>
<artifactId>android-maven-plugin</artifactId>
</plugin>
<plugin>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
<build>
<plugins>
<plugin>
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
<groupId>com.simpligility.maven.plugins</groupId>
<artifactId>android-maven-plugin</artifactId>
</plugin>
<plugin>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
<build>
<plugins>
<plugin>
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
<groupId>com.simpligility.maven.plugins</groupId>
<artifactId>android-maven-plugin</artifactId>
</plugin>
<plugin>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<build>
<plugins>
<plugin>
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
<groupId>com.simpligility.maven.plugins</groupId>
<artifactId>android-maven-plugin</artifactId>
</plugin>
<plugin>
Expand Down
13 changes: 13 additions & 0 deletions findbugs-exclude.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<FindBugsFilter>
<Match>
<Bug pattern="WMI_WRONG_MAP_ITERATOR" />
<Class name="com.octo.android.robospice.SpiceManager" />
<Or>
<Method name="removeListenersOfCachedRequestToLaunch" />
<Method name="removeListenersOfPendingCachedRequest" />
<Method name="dontNotifyAnyRequestListenersInternal" />
<Method name="removeListenersOfAllPendingCachedRequests" />
</Or>
</Match>
</FindBugsFilter>
21 changes: 14 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -103,28 +103,28 @@
<android-platform.version>19</android-platform.version>
<android-annotations.version>4.1.1.4</android-annotations.version>
<easymock.version>3.2</easymock.version>
<dexmaker.version>1.1</dexmaker.version>
<dexmaker.version>1.2</dexmaker.version>
<mockwebserver.version>20130706</mockwebserver.version>
<junit.version>4.11</junit.version>
<commons-logging.version>1.2</commons-logging.version>

<!-- PLUGINS VERSIONS -->
<android-maven-plugin.version>3.8.2</android-maven-plugin.version>
<android-maven-plugin.version>4.4.1</android-maven-plugin.version>
<site-maven-plugin.version>0.9</site-maven-plugin.version>
<maven-project-info-reports-plugin.version>2.7</maven-project-info-reports-plugin.version>
<maven-surefire-report-plugin.version>2.15</maven-surefire-report-plugin.version>
<maven-gpg-plugin.version>1.4</maven-gpg-plugin.version>
<maven-source-plugin.version>2.2.1</maven-source-plugin.version>
<maven-deploy-plugin.version>2.7</maven-deploy-plugin.version>
<maven-release-plugin.version>2.5</maven-release-plugin.version>
<maven-javadoc-plugin.version>2.9</maven-javadoc-plugin.version>
<maven-javadoc-plugin.version>2.10.3</maven-javadoc-plugin.version>
<maven-jxr-plugin.version>2.3</maven-jxr-plugin.version>
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
<maven-dependency-plugin.version>2.8</maven-dependency-plugin.version>
<maven-compiler-plugin.version>3.5.1</maven-compiler-plugin.version>
<maven-dependency-plugin.version>2.8</maven-dependency-plugin.version>
<maven-site-plugin.version>3.3</maven-site-plugin.version>
<doxia-module-markdown.version>1.3</doxia-module-markdown.version>
<maven-pmd-plugin.version>3.0.1</maven-pmd-plugin.version>
<findbugs-maven-plugin.version>2.5.3</findbugs-maven-plugin.version>
<findbugs-maven-plugin.version>3.0.3</findbugs-maven-plugin.version>
<maven-checkstyle-plugin.version>2.11</maven-checkstyle-plugin.version>
<eclipse-lifecycle-plugin.version>1.0.0</eclipse-lifecycle-plugin.version>

Expand Down Expand Up @@ -249,7 +249,7 @@
</plugin>
<!-- Android config -->
<plugin>
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
<groupId>com.simpligility.maven.plugins</groupId>
<artifactId>android-maven-plugin</artifactId>
<version>${android-maven-plugin.version}</version>
<configuration>
Expand Down Expand Up @@ -286,6 +286,10 @@
<goals>
<goal>jar</goal>
</goals>
<configuration>
<!-- Disable a new Java 8 DocLint feature so far -->
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>
</execution>
<execution>
<id>aggregate</id>
Expand Down Expand Up @@ -343,6 +347,9 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>${findbugs-maven-plugin.version}</version>
<configuration>
<excludeFilterFile>findbugs-exclude.xml</excludeFilterFile>
</configuration>
<executions>
<execution>
<id>findbugs-check</id>
Expand Down
2 changes: 1 addition & 1 deletion robospice-cache-parent/robospice-cache-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<build>
<plugins>
<plugin>
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
<groupId>com.simpligility.maven.plugins</groupId>
<artifactId>android-maven-plugin</artifactId>
</plugin>
<plugin>
Expand Down
2 changes: 1 addition & 1 deletion robospice-core-parent/robospice-core-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<build>
<plugins>
<plugin>
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
<groupId>com.simpligility.maven.plugins</groupId>
<artifactId>android-maven-plugin</artifactId>
</plugin>
<plugin>
Expand Down

0 comments on commit eb0c639

Please sign in to comment.