Update plugins (now requires Maven 3.2); fix javadoc warning

core/src/main/java/com/google/zxing/common/BitMatrix.java

@@ -408,16 +408,27 @@ public final class BitMatrix implements Cloneable {
     return hash;
   }
 
+  /**
+   * @return string representation using "X" for set and " " for unset bits
+   */
   @Override
   public String toString() {
     return toString("X ", "  ");
   }
 
+  /**
+   * @param setString representation of a set bit
+   * @param unsetString representation of an unset bit
+   * @return string representation of entire matrix utilizing given strings
+   */
   public String toString(String setString, String unsetString) {
     return toString(setString, unsetString, "\n");
   }
 
   /**
+   * @param setString representation of a set bit
+   * @param unsetString representation of an unset bit
+   * @param lineSeparator newline character in string representation
    * @deprecated call {@link #toString(String,String)} only, which uses \n line separator always
    */
   @Deprecated

pom.xml

@@ -94,6 +94,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <java.version>1.7</java.version>
+    <maven.version.min>3.2.1</maven.version.min>
     <slf4j.version>1.7.12</slf4j.version>
     <!-- This can't reference project.version as some subprojects version differently -->
     <zxing.version>3.2.1-SNAPSHOT</zxing.version>
@@ -136,7 +137,7 @@
                 <rules>
                   <dependencyConvergence />
                   <requireMavenVersion>
-                    <version>3.1.1</version>
+                    <version>${maven.version.min}</version>
                   </requireMavenVersion>
                   <requireJavaVersion>
                     <version>${java.version}</version>
@@ -177,7 +178,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
-          <version>2.10.2</version>
+          <version>2.10.3</version>
           <configuration>
             <javadocVersion>${java.version}</javadocVersion>
           </configuration>
@@ -260,7 +261,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-release-plugin</artifactId>
-          <version>2.5.1</version>
+          <version>2.5.2</version>
           <dependencies>
             <dependency>
               <groupId>org.apache.maven.scm</groupId>
@@ -332,7 +333,7 @@
         <plugin>
           <groupId>com.simpligility.maven.plugins</groupId>
           <artifactId>android-maven-plugin</artifactId>
-          <version>4.1.1</version>
+          <version>4.2.0</version>
           <extensions>true</extensions>
           <executions>
             <execution>
@@ -362,6 +363,7 @@
             <resourceDirectory>res</resourceDirectory>
             <assetsDirectory>assets</assetsDirectory>
             <nativeLibrariesDirectory>libs</nativeLibrariesDirectory>
+            <disableConflictingDependenciesWarning>true</disableConflictingDependenciesWarning>
           </configuration>
           <dependencies>
             <dependency>
@@ -570,7 +572,7 @@
   </scm>
 
   <prerequisites>
-    <maven>3.1.1</maven>
+    <maven>${maven.version.min}</maven>
   </prerequisites>
 
   <distributionManagement>